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 /Documentation/fmt-merge-msg-config.txt | |
| parent | Merge branch 'jt/fetch-tips-in-partial-clone' (diff) | |
| parent | rev-parse: --show-superproject-working-tree should work during a merge (diff) | |
| download | tgif-d152a74e2584dd0e235c9bcc97ef6a9ed239994a.tar.xz | |
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 'Documentation/fmt-merge-msg-config.txt')
0 files changed, 0 insertions, 0 deletions