diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-19 13:34:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-19 13:34:04 +0900 |
| commit | d152a74e2584dd0e235c9bcc97ef6a9ed239994a (patch) | |
| tree | a8a6534606e4f64409580b49607cd0a0f9aaada9 /builtin/commit-graph.c | |
| parent | a1e9dff182b19a2620aab036c22389d22b9dd0be (diff) | |
| parent | c5cbb27cb5f0a94ac5d0882778a00add829ad9d9 (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
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions