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