File tree Expand file tree Collapse file tree 1 file changed +10
-7
lines changed Expand file tree Collapse file tree 1 file changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -626,13 +626,16 @@ See also INCOMPATIBLE OPTIONS below.
626
626
Automatically reschedule `exec` commands that failed. This only makes
627
627
sense in interactive mode (or when an `--exec` option was provided).
628
628
+
629
- Even though this option applies once a rebase is started, it's set for
630
- the whole rebase at the start based on either the
631
- `rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1]
632
- or "CONFIGURATION" below) or whether this option is
633
- provided. Otherwise an explicit `--no-reschedule-failed-exec` at the
634
- start would be overridden by the presence of
635
- `rebase.rescheduleFailedExec=true` configuration.
629
+ This option applies once a rebase is started. It is preserved for the whole
630
+ rebase based on, in order, the command line option provided to the initial `git
631
+ rebase`, the `rebase.rescheduleFailedExec` configuration (see
632
+ linkgit:git-config[1] or "CONFIGURATION" below), or it defaults to false.
633
+ +
634
+ Recording this option for the whole rebase is a convenience feature. Otherwise
635
+ an explicit `--no-reschedule-failed-exec` at the start would be overridden by
636
+ the presence of a `rebase.rescheduleFailedExec=true` configuration when `git
637
+ rebase --continue` is invoked. Currently, you cannot pass
638
+ `--[no-]reschedule-failed-exec` to `git rebase --continue`.
636
639
637
640
--update-refs::
638
641
--no-update-refs::
You can’t perform that action at this time.
0 commit comments