From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jun 2017 00:03:13 +0000 (+0900)
Subject: Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint
X-Git-Tag: v2.13.1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00c0e40f020581ff010a3efd96243bf0ae726fb0;p=git

Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint

"git interpret-trailers", when used as GIT_EDITOR for "git commit
-v", looked for and appended to a trailer block at the very end,
i.e. at the end of the "diff" output.  The command has been
corrected to pay attention to the cut-mark line "commit -v" adds to
the buffer---the real trailer block should appear just before it.

* bm/interpret-trailers-cut-line-is-eom:
  interpret-trailers: honor the cut line
---

00c0e40f020581ff010a3efd96243bf0ae726fb0