Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000
(21:58 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000
(21:58 -0800)
* js/maint-merge-use-prepare-commit-msg-hook:
merge: honor prepare-commit-msg hook
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
fc7ae9c
65969d4
)
diff --cc
builtin/merge.c
Simple merge