summaryrefslogtreecommitdiff
path: root/builtin/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-29 12:34:52 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-29 12:34:53 +0900
commit965993d1ef59fe1667a0e32c213569be6a6535af (patch)
tree6196e62d9e95924e8a4b224e3452046568cc227a /builtin/notes.c
parent6f7f11f7aa7b95c1555cd389a219f76ee30b5cc7 (diff)
parentd76650b8d16c9e5e7b6ee94e6922a3b99be74746 (diff)
downloadgit-965993d1ef59fe1667a0e32c213569be6a6535af.tar.gz
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
Diffstat (limited to 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions