From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> With the exception of 'rebase -m' when continuing after stopping for the user to resolve conflicts, they all forget the setting of --rerere-autoupdate. Phillip Wood (6): am: remember --rerere-autoupdate setting rebase: honor --rerere-autoupdate rebase -i: honor --rerere-autoupdate t3504: use test_commit cherry-pick/revert: remember --rerere-autoupdate cherry-pick/revert: reject --rerere-autoupdate when continuing builtin/am.c | 12 ++++++ builtin/revert.c | 2 + git-rebase--am.sh | 3 +- git-rebase--interactive.sh | 7 ++-- sequencer.c | 20 +++++++++- t/t3418-rebase-continue.sh | 85 +++++++++++++++++++++++++++------------- t/t3504-cherry-pick-rerere.sh | 90 +++++++++++++++++++++++++++++++++++-------- 7 files changed, 170 insertions(+), 49 deletions(-) -- 2.13.3
