From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Sep 2017 08:02:51 +0000 (+0900)
Subject: Merge branch 'pw/am-signoff' into maint
X-Git-Tag: v2.14.2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00fd0afefd6b2a37497141d1d2a0d95210806406;p=git

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

00fd0afefd6b2a37497141d1d2a0d95210806406