| commit | 9674e7a333150d4f4a4752b25b4066bcd0406ddf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Nov 2018 13:57:48 +0000 (21 22:57 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Nov 2018 13:57:48 +0000 (21 22:57 +0900) | ||
| tree | c64c5d9732346ddf2f6084154e98f8cb0cc8ee6a | treesnapshot (tar.gz zip) |
| parent | 254db3035ccf3413ab997c4baf2d3b8b7bb4c054 | commitdiff |
| parent | c5cbb27cb5f0a94ac5d0882778a00add829ad9d9 | commitdiff |
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
A corner-case bugfix.
* sm/show-superproject-while-conflicted:
rev-parse: --show-superproject-working-tree should work during a merge
| submodule.c | diff1 | diff2 | blobhistory |