From: Junio C Hamano Date: Thu, 11 Jul 2019 22:16:48 +0000 (-0700) Subject: Merge branch 'js/rebase-reschedule-applies-only-to-interactive' X-Git-Tag: v2.23.0-rc0~48 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/64096fb41d36cf0e9808c9d15ae46ec364e5c800 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 --- 64096fb41d36cf0e9808c9d15ae46ec364e5c800