git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f80fb1 735285b)
Merge branch 'pw/am-signoff' into maint
authorJunio C Hamano <redacted>
Sun, 10 Sep 2017 08:02:51 +0000 (17:02 +0900)
committerJunio C Hamano <redacted>
Sun, 10 Sep 2017 08:02:51 +0000 (17:02 +0900)
commit00fd0afefd6b2a37497141d1d2a0d95210806406
treed5ac5b39c0ae1852a91e06d78de5ef2a74380a6ctree | snapshot
parent0f80fb185e438a45c734c158c67f479ee4a837bccommit | diff
parent735285b403ee2b09c03d31f2dc8cc95a2d471eadcommit | diff
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
builtin/am.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT