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 @@ -620,13 +620,16 @@ See also INCOMPATIBLE OPTIONS below.
620620 Automatically reschedule `exec` commands that failed. This only makes
621621 sense in interactive mode (or when an `--exec` option was provided).
622622+
623- Even though this option applies once a rebase is started, it's set for
624- the whole rebase at the start based on either the
625- `rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1]
626- or "CONFIGURATION" below) or whether this option is
627- provided. Otherwise an explicit `--no-reschedule-failed-exec` at the
628- start would be overridden by the presence of
629- `rebase.rescheduleFailedExec=true` configuration.
623+ This option applies once a rebase is started. It is preserved for the whole
624+ rebase based on, in order, the command line option provided to the initial `git
625+ rebase`, the `rebase.rescheduleFailedExec` configuration (see
626+ linkgit:git-config[1] or "CONFIGURATION" below), or it defaults to false.
627+ +
628+ Recording this option for the whole rebase is a convenience feature. Otherwise
629+ an explicit `--no-reschedule-failed-exec` at the start would be overridden by
630+ the presence of a `rebase.rescheduleFailedExec=true` configuration when `git
631+ rebase --continue` is invoked. Currently, you cannot pass
632+ `--[no-]reschedule-failed-exec` to `git rebase --continue`.
630633
631634--update-refs::
632635--no-update-refs::
You can’t perform that action at this time.
0 commit comments