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)
commit64096fb41d36cf0e9808c9d15ae46ec364e5c800
tree51a033877cfd78934642963ad968328580798813
parentdf73cb38d942d2fb305a0fbfedd9a093ca386c83
parent906b63942ac7f0ff904228b03d5dbe1edc59f0fe
Merge branch 'js/rebase-reschedule-applies-only-to-interactive'

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
builtin/rebase.c