diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:51 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:51 +0900 |
commit | 00fd0afefd6b2a37497141d1d2a0d95210806406 (patch) | |
tree | d5ac5b39c0ae1852a91e06d78de5ef2a74380a6c /builtin/check-ignore.c | |
parent | Merge branch 'rs/in-obsd-basename-dirname-take-const' into maint (diff) | |
parent | am: fix signoff when other trailers are present (diff) | |
download | tgif-00fd0afefd6b2a37497141d1d2a0d95210806406.tar.xz |
Merge branch 'pw/am-signoff' into maint
"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 'builtin/check-ignore.c')
0 files changed, 0 insertions, 0 deletions