]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/rebase-no-reschedule-failed-exec'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:40 +0000 (12:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:40 +0000 (12:47 +0900)
"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

1  2 
Documentation/git-rebase.txt
sequencer.c

Simple merge
diff --cc sequencer.c
Simple merge