]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6f0e577) | patch
cherry-pick/revert: remember --rerere-autoupdate
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 2 Aug 2017 10:44:19 +0000 (11:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 22:16:09 +0000 (15:16 -0700)
commit8d8cb4b047cef546ea80b8224c7b33707f6d6a4c
tree1f322b953e16e9fc879560a0fc81c67b81042ba0tree | snapshot
parent6f0e577e46619a15baefc48192abee34451effa5commit | diff
cherry-pick/revert: remember --rerere-autoupdate

When continuing after conflicts, cherry-pick forgot if the user had specified
'--rerere-autoupdate'.

Redo the cherry-pick rerere tests to check --rerere-autoupdate works
as expected.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c diff | blob | history
t/t3504-cherry-pick-rerere.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.