diff options
| author |  Brandon Casey <drafnel@gmail.com> | 2013-02-12 02:17:32 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-02-12 11:09:40 -0800 |
| commit | cd650a4eee148dadb0943f415e88c210f18e70df (patch) | |
| tree | 23e4fde6566d06a36ea0f678668dfae9e5a60701 /Documentation/RelNotes/1.6.5.6.txt | |
| parent | t/t3511: add some tests of 'cherry-pick -s' functionality (diff) | |
| download | tgif-cd650a4eee148dadb0943f415e88c210f18e70df.tar.xz | |
sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
When 'cherry-pick -s' is used to append a signed-off-by line to a cherry
picked commit, it does not currently detect the "(cherry picked from..."
that may have been appended by a previous 'cherry-pick -x' as part of the
s-o-b footer and it will insert a blank line before appending a new s-o-b.
Let's detect "(cherry picked from...)" as part of the footer so that we
will produce this:
Signed-off-by: A U Thor <author@example.com>
(cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709)
Signed-off-by: C O Mmitter <committer@example.com>
instead of this:
Signed-off-by: A U Thor <author@example.com>
(cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709)
Signed-off-by: C O Mmitter <committer@example.com>
[with improvements from Jonathan Nieder]
Signed-off-by: Brandon Casey <bcasey@nvidia.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.6.5.6.txt')
0 files changed, 0 insertions, 0 deletions