]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:18 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:18 +0000 (12:38 -0700)
commit8eb5097bea042205810781d786a8eb7abd2962a9
tree15b8115a7c9b0ccd2b7a3b3495bfa13c27647c75
parent1cf76b701050aeb695362df9e704d69636579191
parent906b63942ac7f0ff904228b03d5dbe1edc59f0fe
Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint

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