Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tr/merge-edit-guidance' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Feb 2012 23:31:50 +0000
(15:31 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Feb 2012 23:31:50 +0000
(15:31 -0800)
* tr/merge-edit-guidance:
merge: add instructions to the commit message when editing
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
860f70f
f26af3f
)
diff --cc
builtin/merge.c
Simple merge