summaryrefslogtreecommitdiffstats
path: root/git-apply.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-03 15:14:25 -0800
committerJunio C Hamano <gitster@pobox.com>2015-03-03 15:14:25 -0800
commit22b7549f5378e280118862e7618171c14db05d88 (patch)
treee8082c39aa33ff201475ad6f1997189d3dc4baeb /git-apply.html
parent9c66b3659d279e45c6ea4bb9f364491ffb9494a9 (diff)
downloadgit-htmldocs-22b7549f5378e280118862e7618171c14db05d88.tar.gz
Autogenerated HTML docs for v2.3.1-184-g97c12
Diffstat (limited to 'git-apply.html')
-rw-r--r--git-apply.html18
1 files changed, 16 insertions, 2 deletions
diff --git a/git-apply.html b/git-apply.html
index cf57a6440..4f93d8380 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -755,7 +755,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] [&lt;patch&gt;&#8230;]</pre>
+ [--verbose] [--unsafe-paths] [&lt;patch&gt;&#8230;]</pre>
<div class="attribution">
</div></div>
</div>
@@ -1128,6 +1128,20 @@ behavior:</p></div>
can be applied to the file in the working tree <code>modules/git-gui/git-gui.sh</code> by
running <code>git apply --directory=modules/git-gui</code>.</p></div>
</dd>
+<dt class="hdlist1">
+--unsafe-paths
+</dt>
+<dd>
+<p>
+ By default, a patch that affects outside the working area
+ (either a Git controlled working tree, or the current working
+ directory when "git apply" is used as a replacement of GNU
+ patch) is rejected as a mistake (or a mischief).
+</p>
+<div class="paragraph"><p>When <code>git apply</code> is used as a "better GNU patch", the user can pass
+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>
</dl></div>
</div>
</div>
@@ -1188,7 +1202,7 @@ subdirectory is checked and (if possible) updated.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2015-03-03 15:13:37 PST
</div>
</div>
</body>