summaryrefslogtreecommitdiff
path: root/trace2
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2019-04-17 11:23:29 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-19 12:05:28 +0900
commitdc42e9a83a9e9206566b6bc9b57f431b98682b29 (patch)
treec650fa02e5fd7c3294cc66e3ce1ac6f7ab31955a /trace2
parentmerge: add scissors line on merge conflict (diff)
downloadtgif-dc42e9a83a9e9206566b6bc9b57f431b98682b29.tar.xz
sequencer.c: save and restore cleanup mode
If the user specifies an explicit cleanup mode then save and restore it so that it is preserved by 'git cherry-pick --continue'. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trace2')
0 files changed, 0 insertions, 0 deletions