| commit | 5fb415b57f93330b5ceb743ac36d99da10ac00b1 | |
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | |
| Wed, 2 Aug 2017 10:44:16 +0000 (2 11:44 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Aug 2017 22:16:09 +0000 (2 15:16 -0700) | ||
| tree | 82805d3fcff2ddcdb41cdf1a4c47107ef5b3d32b | treesnapshot (tar.gz zip) |
| parent | fd4a3f486d97682a0f42dfc84fe7af742bd76230 | commitdiff |
rebase: honor --rerere-autoupdate
Rebase accepts '--rerere-autoupdate' as an option but only honors it
if '-m' is also given. Fix it for a non-interactive rebase by passing
on the option to 'git am' and 'git cherry-pick'. Rework the tests so
that they can be used for each rebase flavor and extend them.
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>
Rebase accepts '--rerere-autoupdate' as an option but only honors it
if '-m' is also given. Fix it for a non-interactive rebase by passing
on the option to 'git am' and 'git cherry-pick'. Rework the tests so
that they can be used for each rebase flavor and extend them.
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--am.sh | diffblobblamehistory | |
| t/t3418-rebase-continue.sh | diffblobblamehistory |