]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1e9dff c5cbb27)
Merge branch 'sm/show-superproject-while-conflicted'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Oct 2018 04:34:04 +0000 (13:34 +0900)
committerJunio 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

diff --cc submodule.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.