From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 16 Nov 2010 19:35:04 GMT
Subject: Re: cherry-pick -x formats the message incorrectly
Message-ID: <20101116193504.GB15828@burratino>
In-Reply-To: <7vpqu5gjmv.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> Martin Svensson <martin.k.svensson@netinsight.se> writes:

>> It should be:
>>
>>   foo
>>   
>>   (cherry picked from commit eb42a6475d2c2e4fff7a1b626ce6e27eec21e886)
>>
>> Am I right?
>
> I tend to agree (modulo s/summary/subject/ would be the wording I would
> have used).
>
> This falls into "patches welcome" category, though.  I do not think
> anybody sane is still using cherry-pick with -x option these days after
> http://thread.gmane.org/gmane.comp.version-control.git/28378

Mm, I use it and do not agree; I think the rule should rather be:

 - if there is a Signed-off chain, quietly integrate into that (no added
   newline)

 - if there is not a Signed-off chain, add the extra newline.

Patch for a related issue in a few minutes.