From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 May 2017 03:34:52 +0000 (+0900)
Subject: Merge branch 'bm/interpret-trailers-cut-line-is-eom'
X-Git-Tag: v2.14.0-rc0~152
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/965993d1ef59fe1667a0e32c213569be6a6535af?ds=inline;hp=--cc

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

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

965993d1ef59fe1667a0e32c213569be6a6535af