summaryrefslogtreecommitdiffstats
path: root/git-apply.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-12-23 00:31:01 -0800
committerJunio C Hamano <gitster@pobox.com>2021-12-23 00:31:01 -0800
commit3cb60ffb58b400b0d281389d019996b1d9d83b78 (patch)
tree757f79a272cda6e13edd8030b89e271b197b8a48 /git-apply.html
parent5009f01c2d5c4f539728c0f01b0b6445242fc7c6 (diff)
downloadgit-htmldocs-3cb60ffb58b400b0d281389d019996b1d9d83b78.tar.gz
Autogenerated HTML docs for v2.34.1-390-g2ae0a
Diffstat (limited to 'git-apply.html')
-rw-r--r--git-apply.html25
1 files changed, 23 insertions, 2 deletions
diff --git a/git-apply.html b/git-apply.html
index 879e1c813..1087f69c8 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -756,7 +756,7 @@ git-apply(1) Manual Page
[--ignore-space-change | --ignore-whitespace]
[--whitespace=(nowarn|warn|fix|error|error-all)]
[--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--directory=&lt;root&gt;]
- [--verbose] [--unsafe-paths] [&lt;patch&gt;&#8230;]</pre>
+ [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [&lt;patch&gt;&#8230;]</pre>
<div class="attribution">
</div></div>
</div>
@@ -1125,6 +1125,18 @@ behavior:</p></div>
</p>
</dd>
<dt class="hdlist1">
+-q
+</dt>
+<dt class="hdlist1">
+--quiet
+</dt>
+<dd>
+<p>
+ Suppress stderr output. Messages about patch status and progress
+ will not be printed.
+</p>
+</dd>
+<dt class="hdlist1">
--recount
</dt>
<dd>
@@ -1160,6 +1172,15 @@ running <code>git apply --directory=modules/git-gui</code>.</p></div>
the <code>--unsafe-paths</code> option to override this safety check. This option
has no effect when <code>--index</code> or <code>--cached</code> is in use.</p></div>
</dd>
+<dt class="hdlist1">
+--allow-empty
+</dt>
+<dd>
+<p>
+ Don&#8217;t return error for patches containing no diff. This includes
+ empty patches and patches with commit text only.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1221,7 +1242,7 @@ subdirectory is checked and (if possible) updated.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-04-16 15:42:56 PDT
+ 2021-12-23 00:29:30 PST
</div>
</div>
</body>