global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase -i: honor --rerere-autoupdate

Browse Source 
Interactive rebase was ignoring '--rerere-autoupdate'. Fix this by
reading it appropriate file when restoring the sequencer state for an
interactive rebase and passing '--rerere-autoupdate' to merge and
cherry-pick when rebasing with '--preserve-merges'.

Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood
2017-08-02 11:44:17 +01:00
committed by Junio C Hamano
parent 5fb415b57f
commit 9b6d7a6245
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
t/t3418-rebase-continue.sh
View File

@@ -141,5 +141,8 @@ test_rerere_autoupdate () {
test_rerere_autoupdate
test_rerere_autoupdate -m
GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
test_rerere_autoupdate -i
test_rerere_autoupdate --preserve-merges
test_done