1 files changed, 40 insertions, 10 deletions
diff --git a/git-rebase.html b/git-rebase.html
index d4684e8bb..ae701ce45 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1077,21 +1077,51 @@ 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|stop)
 </dt>
 <dd>
 <p>
         How to handle commits that are not empty to start and are not
         clean cherry-picks of any upstream commit, but which become
         empty after rebasing (because they contain a subset of already
-        upstream changes).  With drop (the default), commits that
-        become empty are dropped.  With keep, such commits are kept.
-        With ask (implied by <code>--interactive</code>), the rebase will halt when
-        an empty commit is applied allowing you to choose whether to
-        drop it, edit files more, or just commit the empty changes.
-        Other options, like <code>--exec</code>, will use the default of drop unless
-        <code>-i</code>/<code>--interactive</code> is explicitly specified.
+        upstream changes):
 </p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>drop</code>
+</dt>
+<dd>
+<p>
+        The commit will be dropped. This is the default behavior.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>keep</code>
+</dt>
+<dd>
+<p>
+        The commit will be kept. This option is implied when <code>--exec</code> is
+        specified unless <code>-i</code>/<code>--interactive</code> is also specified.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>stop</code>
+</dt>
+<dt class="hdlist1">
+<code>ask</code>
+</dt>
+<dd>
+<p>
+        The rebase will halt when the commit is applied, allowing you to
+        choose whether to drop it, edit files more, or just commit the empty
+        changes. This option is implied when <code>-i</code>/<code>--interactive</code> is
+        specified. <code>ask</code> is a deprecated synonym of <code>stop</code>.
+</p>
+</dd>
+</dl></div>
+</div></div>
 <div class="paragraph"><p>Note that commits which start empty are kept (unless <code>--no-keep-empty</code>
 is specified), and commits which are clean cherry-picks (as determined
 by <code>git log --cherry-mark ...</code>) are detected and dropped as a
@@ -1747,7 +1777,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|stop)</code> option for changing the behavior
 of handling commits that become empty.</p></div>
 </div>
 <div class="sect2">
@@ -2810,7 +2840,7 @@ sequence.editor
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-25 17:24:49 PDT
+ 2024-04-03 15:35:56 PDT
 </div>
 </div>
 </body>