diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:24 +0900 |
| commit | b877cb4a7ec2fafd03b6a3a70c26370744a32c1b (patch) | |
| tree | 841a4389aea1aef57d9278bec5f966de5bb1ef7e /git.c | |
| parent | Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix' (diff) | |
| parent | cherry-pick/revert: add scissors line on merge conflict (diff) | |
| download | tgif-b877cb4a7ec2fafd03b6a3a70c26370744a32c1b.tar.xz | |
Merge branch 'dl/merge-cleanup-scissors-fix'
The list of conflicted paths shown in the editor while concluding a
conflicted merge was shown above the scissors line when the
clean-up mode is set to "scissors", even though it was commented
out just like the list of updated paths and other information to
help the user explain the merge better.
* dl/merge-cleanup-scissors-fix:
cherry-pick/revert: add scissors line on merge conflict
sequencer.c: save and restore cleanup mode
merge: add scissors line on merge conflict
merge: cleanup messages like commit
parse-options.h: extract common --cleanup option
commit: extract cleanup_mode functions to sequencer
t7502: clean up style
t7604: clean up style
t3507: clean up style
t7600: clean up style
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions