| commit | 5c3895dfbd24a5ea23a8899ac40730359a6b2613 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Aug 2017 17:29:07 +0000 (22 10:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Aug 2017 17:29:07 +0000 (22 10:29 -0700) | ||
| tree | e3f3a7813ee6e63eafe9f320de8eb288c230f180 | treesnapshot (tar.gz zip) |
| parent | 5498d6961efdd32665b012d48a7fb8d1554c1643 | commitdiff |
| parent | 735285b403ee2b09c03d31f2dc8cc95a2d471ead | commitdiff |
Merge branch 'pw/am-signoff'
"git am -s" has been taught that some input may end with a trailer
block that is not Signed-off-by: and it should refrain from adding
an extra blank line before adding a new sign-off in such a case.
* pw/am-signoff:
am: fix signoff when other trailers are present
"git am -s" has been taught that some input may end with a trailer
block that is not Signed-off-by: and it should refrain from adding
an extra blank line before adding a new sign-off in such a case.
* pw/am-signoff:
am: fix signoff when other trailers are present
| builtin/am.c | diff1 | diff2 | blobhistory |