diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-07 03:47:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 03:47:40 (GMT) |
| commit | 0377ac98dcf797d4711d2f0757ce49171ee4bb04 (patch) | |
| tree | eeac49d28b994b1b897fb54216022d4d400d4fcb /Documentation/git-rebase.txt | |
| parent | 5a357fa477bd9d7f9190cca3e5a7ef1186c3d64a (diff) | |
| parent | e5b32bffd1ddec64a1d1f593764d05841dd715e5 (diff) | |
| download | git-0377ac98dcf797d4711d2f0757ce49171ee4bb04.zip git-0377ac98dcf797d4711d2f0757ce49171ee4bb04.tar.gz git-0377ac98dcf797d4711d2f0757ce49171ee4bb04.tar.bz2 | |
Merge branch 'ab/rebase-no-reschedule-failed-exec'
"git rebase --[no-]reschedule-failed-exec" did not work well with
its configuration variable, which has been corrected.
* ab/rebase-no-reschedule-failed-exec:
rebase: don't override --no-reschedule-failed-exec with config
rebase tests: camel-case rebase.rescheduleFailedExec consistently
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 8423d46..55af6fd 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -617,6 +617,14 @@ See also INCOMPATIBLE OPTIONS below. --no-reschedule-failed-exec:: 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. INCOMPATIBLE OPTIONS -------------------- |