summaryrefslogtreecommitdiff
path: root/git-mv.perl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-01-27 23:05:05 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-01-27 23:05:05 -0800
commit6b94f1e404afc552e5139c4357331843f5be61ad (patch)
tree78e89a35f8704f894b4c6c991a3228638bff4462 /git-mv.perl
parentMerge fixes up to GIT 1.1.5 (diff)
downloadtgif-6b94f1e404afc552e5139c4357331843f5be61ad.tar.xz
merge: seed the commit message with list of conflicted files.
The files with conflicts need to be hand resolved, and it is a good discipline for the committer to explain which branch was taken and why. Pre-fill the merge message template with the list of conflicted paths to encourage it. This is from Linus. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-mv.perl')
0 files changed, 0 insertions, 0 deletions