| commit | 00c0e40f020581ff010a3efd96243bf0ae726fb0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:03:13 +0000 (5 09:03 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:03:13 +0000 (5 09:03 +0900) | ||
| tree | b2da71224902e8bae1834bf1baf91a7dbc34f20a | treesnapshot (tar.gz zip) |
| parent | fd8567c99023c62ca206d930dfbf41a92648ea9a | commitdiff |
| parent | d76650b8d16c9e5e7b6ee94e6922a3b99be74746 | commitdiff |
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
"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
| wt-status.c | diff1 | diff2 | blobhistory |