From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 May 2021 03:47:40 +0000 (+0900)
Subject: Merge branch 'ab/rebase-no-reschedule-failed-exec'
X-Git-Tag: v2.32.0-rc0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0377ac98dcf797d4711d2f0757ce49171ee4bb04;p=thirdparty%2Fgit.git

Merge branch 'ab/rebase-no-reschedule-failed-exec'

"git rebase --[no-]reschedule-failed-exec" did not work well with
its configuration variable, which has been corrected.

* ab/rebase-no-reschedule-failed-exec:
  rebase: don't override --no-reschedule-failed-exec with config
  rebase tests: camel-case rebase.rescheduleFailedExec consistently
---

0377ac98dcf797d4711d2f0757ce49171ee4bb04