]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/rebase-reschedule-applies-only-to-interactive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2019 22:16:48 +0000 (15:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2019 22:16:48 +0000 (15:16 -0700)
The configuration variable rebase.rescheduleFailedExec should be
effective only while running an interactive rebase and should not
affect anything when running an non-interactive one, which was not
the case.  This has been corrected.

* js/rebase-reschedule-applies-only-to-interactive:
  rebase --am: ignore rebase.rescheduleFailedExec

1  2 
builtin/rebase.c

Simple merge