From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:18 +0000 (-0700)
Subject: Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint
X-Git-Tag: v2.23.0-rc0~1^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8eb5097bea042205810781d786a8eb7abd2962a9?hp=--cc

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
---

8eb5097bea042205810781d786a8eb7abd2962a9