| commit | 6b94f1e404afc552e5139c4357331843f5be61ad | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Jan 2006 07:05:05 +0000 (27 23:05 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Jan 2006 07:05:05 +0000 (27 23:05 -0800) | ||
| tree | 78e89a35f8704f894b4c6c991a3228638bff4462 | treesnapshot (tar.gz zip) |
| parent | 767e130915015f897fb87b939843b4882212574b | commitdiff |
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>
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 | diffblobblamehistory |