From owner-freebsd-git@freebsd.org Sat May 1 01:57:41 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3670F5F4629 for ; Sat, 1 May 2021 01:57:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXC6r19Wcz3wBG for ; Sat, 1 May 2021 01:57:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72b.google.com with SMTP id 8so138153qkv.8 for ; Fri, 30 Apr 2021 18:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Nd65wrFO+gRblWBCJpSoMzwUovRZEsYMt0qHSo+j55c=; b=0NWGl12efdFuDe4E9F0Hhg0t7OfcTgR8SM9/w3EpInvrjnN5TIi/cnnyLYu/0GCqXG vQGBaLxNtIpHjl2CxMWNHiFA3APbE1XXwsduaES4SfskakWNFl2nfPqWShG0c4Odh6O1 3BG/rWePiDtl81asoG9al0FlY6aqcqUgAhhqYoKUJB8FzYOgK9c6MdSO3nMOTkRIEL3V MxSv+XgcIHnjIedyOrM3gPPTDdmt2Y19KvU4Z8IB1pJnA7ZFW4xI0OXp7kHkm54lOg/q RaanQo1KMZThIKJiNfwvVSaoOy/U5SAiyXMi/SCzg1U3w+BBInl4YxwmGwyU4yAPedyG M5eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Nd65wrFO+gRblWBCJpSoMzwUovRZEsYMt0qHSo+j55c=; b=dOCXuX29fouJsqhhuMSXfcURgeeJtDMhNEuU0ADLsMNVwt7YkCWzOF5nw1609lCB73 QqjPr1neYatQV+km4AbpoujcaSkavglQIz4pUfvw5po2/kEP5G6qxnXmEljowLUs15vY MrpTuKIT6KHG++JXhZs5KdHxMB8kaEU2djDBRBB/f9eMpU9bZLLO0zmv1aG5Zn0cqyh4 CbuWVPCjWTZizucLImesJnYZVlMXcYEKaxmrEAJseY7YXHckje47SEqwkhEWyza997ZE o+mDVT5HKz6mlRb0X4boFvDxuvEWaX+n0VGwEIZBBSw2rQWGhBZ1Do7A2IPR8c1iXk0q nsnA== X-Gm-Message-State: AOAM5321PL5QaV6s8NJOicH4LOrJ8BNWp0r8ivkkjpQZzgwa9010uQUb Q/WohyunmmPIdovZh9jf3eeQxVhP+LhjYq8RsNiR2dUufKvmBA== X-Google-Smtp-Source: ABdhPJybBsPcY1kxsqkMqSHRF1LJxBL0nou4p0eYCQh9idSxExGmO03YpX+K6fWsTaN7GI4fIfBXymC7F+hZMQBCSmI= X-Received: by 2002:a37:7685:: with SMTP id r127mr8275182qkc.359.1619834259124; Fri, 30 Apr 2021 18:57:39 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 30 Apr 2021 19:57:28 -0600 Message-ID: Subject: Re: git cherry-pick To: tech-lists Cc: freebsd-git X-Rspamd-Queue-Id: 4FXC6r19Wcz3wBG X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=0NWGl12e; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72b:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72b:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72b:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2021 01:57:41 -0000 On Fri, Apr 30, 2021 at 7:09 PM tech-lists wrote: > git newbie here. If one has the full git /usr/src repo, and wants to > build for stable/13, what are the commands to "cherry-pick" a commit from > main > and apply it to (local) stable/13? If one is tracking stable/13, one usually is allowing others to figure out what to cherry pick. Generally, it's most commits that don't change the ABI and/or that fix bugs and introduce low risk features. As a tracker of stable/13, one needn't worry too much about the mechanics. Warner