diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-16 12:43:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-16 12:43:46 -0800 |
| commit | ba62bfc4a47119194812fad9200d5fac5a5c15f2 (patch) | |
| tree | d1fb7fad5940beab64150e0d002e2571eac01935 /git-rebase.html | |
| parent | 52d8fce24f6d24558ba9432b8e89bf087c22ff0b (diff) | |
| download | git-htmldocs-ba62bfc4a47119194812fad9200d5fac5a5c15f2.tar.gz | |
Autogenerated HTML docs for v2.43.0-367-g186b1
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/git-rebase.html b/git-rebase.html index 5c262155c..067e046f5 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1592,13 +1592,15 @@ option can be used to override that setting.</p></div> Automatically reschedule <code>exec</code> commands that failed. This only makes
sense in interactive mode (or when an <code>--exec</code> option was provided).
</p>
-<div class="paragraph"><p>Even though this option applies once a rebase is started, it’s set for
-the whole rebase at the start based on either the
-<code>rebase.rescheduleFailedExec</code> configuration (see <a href="git-config.html">git-config(1)</a>
-or "CONFIGURATION" below) or whether this option is
-provided. Otherwise an explicit <code>--no-reschedule-failed-exec</code> at the
-start would be overridden by the presence of
-<code>rebase.rescheduleFailedExec=true</code> configuration.</p></div>
+<div class="paragraph"><p>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 <code>git
+rebase</code>, the <code>rebase.rescheduleFailedExec</code> configuration (see
+<a href="git-config.html">git-config(1)</a> or "CONFIGURATION" below), or it defaults to false.</p></div>
+<div class="paragraph"><p>Recording this option for the whole rebase is a convenience feature. Otherwise
+an explicit <code>--no-reschedule-failed-exec</code> at the start would be overridden by
+the presence of a <code>rebase.rescheduleFailedExec=true</code> configuration when <code>git
+rebase --continue</code> is invoked. Currently, you cannot pass
+<code>--[no-]reschedule-failed-exec</code> to <code>git rebase --continue</code>.</p></div>
</dd>
<dt class="hdlist1">
--update-refs
@@ -2809,7 +2811,7 @@ sequence.editor <div id="footer">
<div id="footer-text">
Last updated
- 2024-01-12 16:26:54 PST
+ 2024-01-16 12:41:37 PST
</div>
</div>
</body>
|