diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-17 10:23:29 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-19 03:05:28 (GMT) |
commit | dc42e9a83a9e9206566b6bc9b57f431b98682b29 (patch) | |
tree | c650fa02e5fd7c3294cc66e3ce1ac6f7ab31955a /t/t3507-cherry-pick-conflict.sh | |
parent | 1055997e2fc707a15baf232df2ac481055c14321 (diff) | |
download | git-dc42e9a83a9e9206566b6bc9b57f431b98682b29.zip git-dc42e9a83a9e9206566b6bc9b57f431b98682b29.tar.gz git-dc42e9a83a9e9206566b6bc9b57f431b98682b29.tar.bz2 |
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 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions