projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fd4a3f4) | patch
rebase: honor --rerere-autoupdate
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 2 Aug 2017 10:44:16 +0000 (11:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 22:16:09 +0000 (15:16 -0700)
commit5fb415b57f93330b5ceb743ac36d99da10ac00b1
tree82805d3fcff2ddcdb41cdf1a4c47107ef5b3d32btree | snapshot
parentfd4a3f486d97682a0f42dfc84fe7af742bd76230commit | diff
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>
git-rebase--am.sh diff | blob | blame | history
t/t3418-rebase-continue.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.