projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 767e130) | patch
merge: seed the commit message with list of conflicted files.
authorJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 07:05:05 +0000 (23:05 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 07:05:05 +0000 (23:05 -0800)
commit6b94f1e404afc552e5139c4357331843f5be61ad
tree78e89a35f8704f894b4c6c991a3228638bff4462tree | snapshot
parent767e130915015f897fb87b939843b4882212574bcommit | diff
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>
git-merge.sh diff | blob | history
The core git plumbing