diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-28 14:05:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-28 14:05:25 -0800 |
| commit | a90214fb857c988a9e8dff46626dc715918a9330 (patch) | |
| tree | 756c139e2481e113fa188ed55f6b2c46c153a7a3 /git-rebase.html | |
| parent | ace33e4fa1aa5ba14bafe92218bf07dea068791f (diff) | |
| download | git-htmldocs-a90214fb857c988a9e8dff46626dc715918a9330.tar.gz | |
Autogenerated HTML docs for v2.20.1-421-g9403f
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index 654745eb7..9a784cdb7 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1029,6 +1029,16 @@ rebase.abbreviateCommands </div></div>
<div class="paragraph"><p>Defaults to false.</p></div>
</dd>
+<dt class="hdlist1">
+rebase.rescheduleFailedExec
+</dt>
+<dd>
+<p>
+ Automatically reschedule <code>exec</code> commands that failed. This only makes
+ sense in interactive mode (or when an <code>--exec</code> option was provided).
+ This is the same as specifying the <code>--reschedule-failed-exec</code> option.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1455,6 +1465,17 @@ without an explicit <code>--interactive</code>.</p></div> <div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>
</dd>
<dt class="hdlist1">
+-y <cmd>
+</dt>
+<dd>
+<p>
+ This is the same as passing <code>--reschedule-failed-exec</code> before
+ <code>-x <cmd></code>, i.e. it appends the specified <code>exec</code> command and
+ turns on the mode where failed <code>exec</code> commands are automatically
+ rescheduled.
+</p>
+</dd>
+<dt class="hdlist1">
--root
</dt>
<dd>
@@ -1509,6 +1530,18 @@ used to override and disable this setting.</p></div> rebase might result in non-trivial conflicts.
</p>
</dd>
+<dt class="hdlist1">
+--reschedule-failed-exec
+</dt>
+<dt class="hdlist1">
+--no-reschedule-failed-exec
+</dt>
+<dd>
+<p>
+ 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>
+</dd>
</dl></div>
</div>
</div>
@@ -2459,7 +2492,7 @@ reorder commits tend to produce counterintuitive results. Use <div id="footer">
<div id="footer-text">
Last updated
- 2019-01-18 15:15:21 PST
+ 2019-01-28 14:04:34 PST
</div>
</div>
</body>
|