diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
commit | a476efaaca349e01dfbc4e1009ab534aa511479b (patch) | |
tree | b0f05e148f284deb9030edaf25419f9f704adb32 /git-apply.html | |
parent | 7cc912979feaec3ed65d4491e129ed48507f6994 (diff) | |
download | git-htmldocs-a476efaaca349e01dfbc4e1009ab534aa511479b.tar.gz |
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
Diffstat (limited to 'git-apply.html')
-rw-r--r-- | git-apply.html | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/git-apply.html b/git-apply.html index 8be2456ef..fa23a8c2c 100644 --- a/git-apply.html +++ b/git-apply.html @@ -326,7 +326,8 @@ git-apply(1) Manual Page [--allow-binary-replacement | --binary] [--reject] [-z]
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
[--whitespace=<nowarn|warn|fix|error|error-all>]
- [--exclude=PATH] [--directory=<root>] [--verbose] [<patch>…]</div></div>
+ [--exclude=PATH] [--include=PATH] [--directory=<root>]
+ [--verbose] [<patch>…]</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -543,6 +544,21 @@ discouraged.</p></div> </p>
</dd>
<dt>
+--include=<path-pattern>
+</dt>
+<dd>
+<p>
+ Apply changes to files matching the given path pattern. This can
+ be useful when importing patchsets, where you want to include certain
+ files or directories.
+</p>
+<div class="para"><p>When --exclude and --include patterns are used, they are examined in the
+order they appear on the command line, and the first match determines if a
+patch to each path is used. A patch to a path that does not match any
+include/exclude pattern is used by default if there is no include pattern
+on the command line, and ignored if there is any include pattern.</p></div>
+</dd>
+<dt>
--whitespace=<action>
</dt>
<dd>
@@ -683,7 +699,7 @@ subdirectory is checked and (if possible) updated.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:32:41 UTC
+Last updated 2008-10-10 15:30:41 UTC
</div>
</div>
</body>
|