From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org,
Martin Svensson <martin.k.svensson@netinsight.se>
Subject: Re: [PATCH] commit -s: allow "(cherry picked " lines in sign-off section
Date: Tue, 16 Nov 2010 17:36:49 -0600 [thread overview]
Message-ID: <20101116233649.GA30700@burratino> (raw)
In-Reply-To: <7vlj4shoej.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> I am not sure I agree with the reasoning of this patch, by the way. A
> cherry-pick is an event that breaks the life of the patch, so it may even
> be a sensible thing to do to express "the above sign-off chain shows who
> were involved in the original commit; I am cherry-picking it out of
> context, and these people do not have much to do with the result" with a
> blank line on both sides of the "cherry picked" line, like this:
>
> A concise summary of the change
>
> A detailed description of the change, why it is needed, what
> was broken and why applying this is the best course of action.
>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>
> (cherry picked from commit 9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0)
>
> Signed-off-by: Back Porter <backporter@example.com>
How is the cherry-pick event different from the send-by-mail-and-apply
event?
In both cases, the result has a distinct commit id and distinct
signoff and it is unlikely that the previous patch handler was testing
with the same tree as the next one. (And each patch handler should add
relevant comments if the new situation warrants that.)
next prev parent reply other threads:[~2010-11-16 23:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 15:11 [PATCH] cherry-pick -x: add newline before pick note Michael J Gruber
2010-11-16 19:30 ` Jeff King
2010-11-16 20:25 ` [PATCH] commit -s: allow "(cherry picked " lines in sign-off section Jonathan Nieder
2010-11-16 20:40 ` Jonathan Nieder
2010-11-16 22:52 ` Junio C Hamano
2010-11-16 23:36 ` Jonathan Nieder [this message]
2010-11-17 16:46 ` Junio C Hamano
2010-11-17 6:23 ` Jay Soffian
2010-11-17 6:14 ` [PATCH] cherry-pick -x: add newline before pick note Jay Soffian
2011-03-08 12:54 ` Oswald Buddenhagen
2011-03-08 22:08 ` Jonathan Nieder
2011-03-08 22:18 ` Oswald Buddenhagen
2011-03-08 22:34 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101116233649.GA30700@burratino \
--to=jrnieder@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.k.svensson@netinsight.se \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).