diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:13 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:13 +0900 |
commit | 00c0e40f020581ff010a3efd96243bf0ae726fb0 (patch) | |
tree | b2da71224902e8bae1834bf1baf91a7dbc34f20a /xdiff | |
parent | Merge branch 'kn/ref-filter-branch-list' into maint (diff) | |
parent | interpret-trailers: honor the cut line (diff) | |
download | tgif-00c0e40f020581ff010a3efd96243bf0ae726fb0.tar.xz |
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
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions