summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-17 11:47:18 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-17 11:47:18 -0800
commit14a9c5f261bcc436b80700076257f02af0beec68 (patch)
tree43f071ef531aaecba55cf73753711f89565aeb05 /xdiff
parent433a30d0ba6e6d258be099859fa98d0205b25634 (diff)
parent1a72cfd7fa88e5a6c2b94568ac2fe69dfbd87f87 (diff)
downloadgit-14a9c5f261bcc436b80700076257f02af0beec68.tar.gz
Merge branch 'jl/commit-v-strip-marker'
"git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. * jl/commit-v-strip-marker: commit -v: strip diffs and submodule shortlogs from the commit message
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions