]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5fb415b) | patch
rebase -i: honor --rerere-autoupdate
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 2 Aug 2017 10:44:17 +0000 (11:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 22:16:09 +0000 (15:16 -0700)
commit9b6d7a6245e3be34a50a94a1174d8aebf5b1a263
treeada9dbb48cea17aa8df9e45192fafdac35e1fc0btree | snapshot
parent5fb415b57f93330b5ceb743ac36d99da10ac00b1commit | diff
rebase -i: honor --rerere-autoupdate

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>
git-rebase--interactive.sh diff | blob | history
sequencer.c diff | blob | history
t/t3418-rebase-continue.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.