]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 254db30 c5cbb27)
Merge branch 'sm/show-superproject-while-conflicted' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:48 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:48 +0000 (22:57 +0900)
commit9674e7a333150d4f4a4752b25b4066bcd0406ddf
treec64c5d9732346ddf2f6084154e98f8cb0cc8ee6atree | snapshot
parent254db3035ccf3413ab997c4baf2d3b8b7bb4c054commit | diff
parentc5cbb27cb5f0a94ac5d0882778a00add829ad9d9commit | diff
Merge branch 'sm/show-superproject-while-conflicted' into maint

A corner-case bugfix.

* sm/show-superproject-while-conflicted:
  rev-parse: --show-superproject-working-tree should work during a merge
submodule.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.