Re: [PATCH] commit -s: allow "(cherry picked " lines in sign-off section

From: Jay Soffian <jaysoffian@gmail.com>
Date: Nov 17, 2010, 06:23 UTC
Message-ID: <AANLkTinpEVuPVhDDfEcrvHa4T5BfL+X5w4y=cJkho4d+@mail.gmail.com>
In-Reply-To: <7vlj4shoej.fsf@alter.siamese.dyndns.org>

On Tue, Nov 16, 2010 at 5:52 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 18 quoted lines

> 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>

Or perhaps prefix them with Original-, inspired by email headers, and which I think makes it even more clear that the sob lines don't apply to the new commit.

        Original-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
        Original-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        Cherry-picked-from: 9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0
        Signed-off-by: Back Porter <backporter@example.com>

j.