From: Brandon Casey Date: Fri, 29 Mar 2013 17:41:17 GMT Subject: Re: [PATCH] cherry-pick -x: improve handling of one-liner commit messages Message-ID: In-Reply-To: <7v8v56p1bl.fsf@alter.siamese.dyndns.org> On Fri, Mar 29, 2013 at 10:23 AM, Junio C Hamano wrote: > Miklos Vajna writes: > >> git cherry-pick -x normally just appends the "cherry picked from commit" >> line at the end of the message, which is fine. However, in case the >> original commit message had only one line, first append a newline, >> otherwise the second line won't be empty, which is against >> recommendations. >> --- > > Sign-off? > > I think this is part of the bc/append-signed-off-by topic that is > about to graduate to 'master'; more specifically, b971e04f54e7 > (sequencer.c: always separate "(cherry picked from" from commit > body, 2013-02-12) does the equivalent, no? Yeah, I think this case is already handled. Miklos, can you check out next and see if your problem case is handled? -Brandon