summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-05 14:01:09 -0800
committerJunio C Hamano <gitster@pobox.com>2014-02-05 14:01:09 -0800
commita118beeddf9d0373078595dd1d1d5f33441a1cdd (patch)
treed4befbf13141706b88aded2f329d388c7084c731 /t/t6035-merge-dir-to-symlink.sh
parentac0835f94bdfd24ebfe228b2f6ace48416223dfd (diff)
parent1a72cfd7fa88e5a6c2b94568ac2fe69dfbd87f87 (diff)
downloadgit-a118beeddf9d0373078595dd1d1d5f33441a1cdd.tar.gz
Merge branch 'jl/commit-v-strip-marker' into maint
"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 't/t6035-merge-dir-to-symlink.sh')
0 files changed, 0 insertions, 0 deletions