Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sm/show-superproject-while-conflicted'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 19 Oct 2018 04:34:04 +0000
(13:34 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 19 Oct 2018 04:34:04 +0000
(13:34 +0900)
A corner-case bugfix.
* sm/show-superproject-while-conflicted:
rev-parse: --show-superproject-working-tree should work during a merge
1
2
submodule.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
a1e9dff
c5cbb27
)
diff --cc
submodule.c
Simple merge