Phillip Wood 8d8cb4b047 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>

2017-08-02 15:16:09 -07:00

67 KiB

Raw Blame History

View Raw