diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:12 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:12 -0800 |
commit | 963eda258aac6d7ce8ce541215dc89b100244d49 (patch) | |
tree | 15fe1509101028accfd4d57af13ad6c417158c4b | |
parent | a064af6ef4b3666e204176a7f92525593435e9c5 (diff) | |
parent | 25aec063265f9efbe542f1a15e6f634b715d305d (diff) | |
download | git-963eda258aac6d7ce8ce541215dc89b100244d49.tar.gz |
Merge branch 'ib/rebase-reschedule-doc' into maint-2.43
Doc update.
* ib/rebase-reschedule-doc:
rebase: clarify --reschedule-failed-exec default
-rw-r--r-- | Documentation/git-rebase.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index b8de442d67..150734fb39 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -620,13 +620,16 @@ See also INCOMPATIBLE OPTIONS below. Automatically reschedule `exec` commands that failed. This only makes 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 -the whole rebase at the start based on either the -`rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1] -or "CONFIGURATION" below) or whether this option is -provided. Otherwise an explicit `--no-reschedule-failed-exec` at the -start would be overridden by the presence of -`rebase.rescheduleFailedExec=true` configuration. +This option applies once a rebase is started. It is preserved for the whole +rebase based on, in order, the command line option provided to the initial `git +rebase`, the `rebase.rescheduleFailedExec` configuration (see +linkgit:git-config[1] or "CONFIGURATION" below), or it defaults to false. ++ +Recording this option for the whole rebase is a convenience feature. Otherwise +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:: --no-update-refs:: |