Brandon Casey wrote: > Let's detect "(cherry picked from...)" as part of the footer so that we > will produce this: > > Signed-off-by: A U Thor <author@xxxxxxxxxxx> > (cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709) > Signed-off-by: C O Mmitter <committer@xxxxxxxxxxx> > > instead of this: > > Signed-off-by: A U Thor <author@xxxxxxxxxxx> > (cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709) > > Signed-off-by: C O Mmitter <committer@xxxxxxxxxxx> Yes, looks sane. A downside is that this produces an arguably worse result when using "-x -s" for a commit that does not already have a sign-off. Before, we had: test: do something great Do something fantastic in a clean and elegant way that only takes two lines of explanation. (cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709) Signed-off-by: C H Errypicker <cherry-picker@xxxxxxxxxxx> Afterwards, we will have: test: do something great Do something fantastic in a clean and elegant way that only takes two lines of explanation. (cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709) Signed-off-by: C H Errypicker <cherry-picker@xxxxxxxxxxx> An ideal result would be completely different: test: do something great commit da39a3ee5e6b4b0d3255bfef95601890afd80709 upstream. Do something fantastic in a clean and elegant way that only takes two lines of explanation. Signed-off-by: C H Errypicker <cherry-picker@xxxxxxxxxxx> In other words, the -x output format that puts the commit id at the end with odd spacing seems to be of questionable taste anyway. But given the constraint of leaving that alone, cramming together the sign-off like this seems like the best we can do, so for what it's worth, Acked-by: Jonathan Nieder <jrnieder@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html