diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 19:29:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 19:29:07 +0200 |
| commit | 5c3895dfbd24a5ea23a8899ac40730359a6b2613 (patch) | |
| tree | e3f3a7813ee6e63eafe9f320de8eb288c230f180 /git-merge-one-file.sh | |
| parent | Merge branch 'rs/t3700-clean-leftover' (diff) | |
| parent | am: fix signoff when other trailers are present (diff) | |
| download | git-5c3895dfbd24a5ea23a8899ac40730359a6b2613.tar.xz git-5c3895dfbd24a5ea23a8899ac40730359a6b2613.zip | |
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
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions