Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jm/mergetool-submodules'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 4 May 2011 22:51:23 +0000
(15:51 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 4 May 2011 22:51:23 +0000
(15:51 -0700)
* jm/mergetool-submodules:
mergetool: Teach about submodules
raw
|
combined
(merge:
7ab576c
ff7f089
)
Trivial merge