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)
commit7678ed822cb454cc3081aa9b70f9d8690eae371c
tree024a6ed27b3773ca406d4003a0bc0bbb00f965ac
parent12232a8cd3eed51542cea5ea7a68af3fa9a88524
parent735285b403ee2b09c03d31f2dc8cc95a2d471ead
Merge branch 'pw/am-signoff' into next

"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