summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-11-07 12:14:48 +0900
committerJunio C Hamano <gitster@pobox.com>2023-11-07 12:14:48 +0900
commit7a133713b32080684945c44192842ee4781738b8 (patch)
tree778f7f5545752680354500eb4276df660e654e01 /git-rebase.html
parent0d3c3f33b133acb599ec269bfb9dcaab2a002cb6 (diff)
downloadgit-htmldocs-7a133713b32080684945c44192842ee4781738b8.tar.gz
Autogenerated HTML docs for v2.43.0-rc0-23-g8be77
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.html b/git-rebase.html
index 93dbedc4d..a3a44f0e5 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1077,7 +1077,7 @@ the merge base to determine the <em>set of commits</em> which will be rebased.</
<div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>
</dd>
<dt class="hdlist1">
---empty={drop,keep,ask}
+--empty=(drop|keep|ask)
</dt>
<dd>
<p>
@@ -1741,7 +1741,7 @@ be dropped automatically with <code>--no-keep-empty</code>).</p></div>
<div class="paragraph"><p>Similar to the apply backend, by default the merge backend drops
commits that become empty unless <code>-i</code>/<code>--interactive</code> is specified (in
which case it stops and asks the user what to do). The merge backend
-also has an <code>--empty={drop,keep,ask}</code> option for changing the behavior
+also has an <code>--empty=(drop|keep|ask)</code> option for changing the behavior
of handling commits that become empty.</p></div>
</div>
<div class="sect2">
@@ -2803,7 +2803,7 @@ sequence.editor
<div id="footer">
<div id="footer-text">
Last updated
- 2023-04-05 08:17:01 JST
+ 2023-11-07 12:13:08 JST
</div>
</div>
</body>