diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
commit | e872a1cfb365aa9016e685705d691f75c4585220 (patch) | |
tree | 0cd8bbdef3f464a809208b7f0c3de532d991b2f5 /git-am.html | |
parent | 05fe8d182bb7801152b0db4240ccc5643720f773 (diff) | |
download | git-htmldocs-e872a1cfb365aa9016e685705d691f75c4585220.tar.gz |
Autogenerated HTML docs for v2.34.1-493-ge83ba
Diffstat (limited to 'git-am.html')
-rw-r--r-- | git-am.html | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html index 27b3f9c4a..9be76612f 100644 --- a/git-am.html +++ b/git-am.html @@ -756,8 +756,9 @@ git-am(1) Manual Page [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
[--quoted-cr=<action>]
+ [--empty=(stop|drop|keep)]
[(<mbox> | <Maildir>)…]
-<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])</pre>
+<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)</pre>
<div class="attribution">
</div></div>
</div>
@@ -857,6 +858,19 @@ current branch.</p></div> </p>
</dd>
<dt class="hdlist1">
+--empty=(stop|drop|keep)
+</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 into 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.
+</p>
+</dd>
+<dt class="hdlist1">
-m
</dt>
<dt class="hdlist1">
@@ -1116,6 +1130,16 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> Defaults to <code>raw</code>.
</p>
</dd>
+<dt class="hdlist1">
+--allow-empty
+</dt>
+<dd>
+<p>
+ After a patch failure on an input e-mail message lacking a patch,
+ create an empty commit with the contents of the e-mail message
+ as its log message.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1209,7 +1233,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-09-23 14:33:59 PDT
+ 2022-01-05 14:13:29 PST
</div>
</div>
</body>
|