Merge branch 'pw/am-signoff' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Aug 2017 20:52:53 +0000 (13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Aug 2017 20:52:53 +0000 (13:52 -0700)
"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

1  2 
builtin/am.c
diff --cc builtin/am.c
Simple merge