Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/submodule-merge-in-merge-recursive'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 13 Jun 2018 19:50:44 +0000
(12:50 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 13 Jun 2018 19:50:45 +0000
(12:50 -0700)
Finishing touches to a topic that already is in 'master'.
* sb/submodule-merge-in-merge-recursive:
merge-submodule: reduce output verbosity
1
2
merge-recursive.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
fb6ac9e
40aac22
)
diff --cc
merge-recursive.c
Simple merge