summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html42
1 files changed, 34 insertions, 8 deletions
diff --git a/git-am.html b/git-am.html
index aaf66a1a6..0c70e24f7 100644
--- a/git-am.html
+++ b/git-am.html
@@ -860,17 +860,43 @@ history without merges.</p></div>
</p>
</dd>
<dt class="hdlist1">
---empty=(stop|drop|keep)
+--empty=(drop|keep|stop)
</dt>
<dd>
<p>
- By default, or when the option is set to <em>stop</em>, the command
- errors out on an input e-mail message lacking a patch
- and stops in the middle of the current am session. When this
- option is set to <em>drop</em>, skip such an e-mail message instead.
- When this option is set to <em>keep</em>, create an empty commit,
- recording the contents of the e-mail message as its log.
+ How to handle an e-mail message lacking a patch:
</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>drop</code>
+</dt>
+<dd>
+<p>
+ The e-mail message will be skipped.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>keep</code>
+</dt>
+<dd>
+<p>
+ An empty commit will be created, with the contents of the e-mail
+ message as its log.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>stop</code>
+</dt>
+<dd>
+<p>
+ The command will fail, stopping in the middle of the current <code>am</code>
+ session. This is the default behavior.
+</p>
+</dd>
+</dl></div>
+</div></div>
</dd>
<dt class="hdlist1">
-m
@@ -1291,7 +1317,7 @@ am.threeWay
<div id="footer">
<div id="footer-text">
Last updated
- 2024-02-27 16:31:29 PST
+ 2024-04-03 15:35:56 PDT
</div>
</div>
</body>