mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ib/rebase-reschedule-doc' into maint-2.43

Browse Source 
Doc update.

* ib/rebase-reschedule-doc:
  rebase: clarify --reschedule-failed-exec default
This commit is contained in:
Junio C Hamano
2024-02-08 16:22:12 -08:00
parent a064af6ef4 25aec06326
commit 963eda258a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Documentation/git-rebase.txt
View File

@ -620,13 +620,16 @@ See also INCOMPATIBLE OPTIONS below.
Automatically reschedule `exec` commands that failed. This only makes Automatically reschedule `exec` commands that failed. This only makes
sense in interactive mode (or when an `--exec` option was provided). sense in interactive mode (or when an `--exec` option was provided).
+ +
Even though this option applies once a rebase is started, it's set for This option applies once a rebase is started. It is preserved for the whole
the whole rebase at the start based on either the rebase based on, in order, the command line option provided to the initial `git
`rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1] rebase`, the `rebase.rescheduleFailedExec` configuration (see
or "CONFIGURATION" below) or whether this option is linkgit:git-config[1] or "CONFIGURATION" below), or it defaults to false.
provided. Otherwise an explicit `--no-reschedule-failed-exec` at the +
start would be overridden by the presence of Recording this option for the whole rebase is a convenience feature. Otherwise
`rebase.rescheduleFailedExec=true` configuration. an explicit `--no-reschedule-failed-exec` at the start would be overridden by
the presence of a `rebase.rescheduleFailedExec=true` configuration when `git
rebase --continue` is invoked. Currently, you cannot pass
`--[no-]reschedule-failed-exec` to `git rebase --continue`.
--update-refs:: --update-refs::
--no-update-refs:: --no-update-refs::