]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd152a74e2584dd0e235c9bcc97ef6a9ed239994a
treea8a6534606e4f64409580b49607cd0a0f9aaada9tree | snapshot
parenta1e9dff182b19a2620aab036c22389d22b9dd0becommit | diff
parentc5cbb27cb5f0a94ac5d0882778a00add829ad9d9commit | diff
Merge branch 'sm/show-superproject-while-conflicted'

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.