diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-01-16 21:11:58 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-01-16 21:11:58 +0300 |
commit | a57da6bfee2d9cdc2d25a8dd22942334666dd56b (patch) | |
tree | ee9e289e95ca89fd810c8cd99f5446b53e0244a7 | |
parent | 4cc0f8e8fa3694fdef632784592fc8af63022618 (diff) | |
parent | 25aec063265f9efbe542f1a15e6f634b715d305d (diff) |
Merge branch 'ib/rebase-reschedule-doc'
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 25516c45d8..8a8d32161b 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -626,13 +626,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:: |