diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-02 11:44:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-02 15:16:09 -0700 |
| commit | 9b6d7a6245e3be34a50a94a1174d8aebf5b1a263 (patch) | |
| tree | ada9dbb48cea17aa8df9e45192fafdac35e1fc0b /commit-tree.c | |
| parent | 5fb415b57f93330b5ceb743ac36d99da10ac00b1 (diff) | |
| download | git-9b6d7a6245e3be34a50a94a1174d8aebf5b1a263.tar.gz | |
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>
Diffstat (limited to 'commit-tree.c')
0 files changed, 0 insertions, 0 deletions