From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 17:29:07 +0000 (-0700)
Subject: Merge branch 'pw/am-signoff'
X-Git-Tag: v2.15.0-rc0~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c3895dfbd24a5ea23a8899ac40730359a6b2613;p=thirdparty%2Fgit.git

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
---

5c3895dfbd24a5ea23a8899ac40730359a6b2613