diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-08-22 05:10:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-08-22 05:10:47 +0000 |
| commit | fe24db05d4bb032effbd10c0ef1e4ad11d09c07c (patch) | |
| tree | 3a575878892ba149206ecb05915d300634fc0828 /git-apply.html | |
| parent | 0df868a88d19f43e96bbc693a53567a4219ed96b (diff) | |
| download | git-htmldocs-fe24db05d4bb032effbd10c0ef1e4ad11d09c07c.tar.gz | |
Autogenerated HTML docs for v1.6.4.1-174-g32f4c
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/git-apply.html b/git-apply.html index da3951566..bead4dff1 100644 --- a/git-apply.html +++ b/git-apply.html @@ -325,6 +325,7 @@ git-apply(1) Manual Page [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
+ [--ignore-space-change | --ignore-whitespace ]
[--whitespace=<nowarn|warn|fix|error|error-all>]
[--exclude=PATH] [--include=PATH] [--directory=<root>]
[--verbose] [<patch>…]</div></div>
@@ -559,6 +560,21 @@ 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>
+--ignore-space-change
+</dt>
+<dt>
+--ignore-whitespace
+</dt>
+<dd>
+<p>
+ When applying a patch, ignore changes in whitespace in context
+ lines if necessary.
+ Context lines will preserve their whitespace, and they will not
+ undergo whitespace fixing regardless of the value of the
+ <tt>--whitespace</tt> option. New lines will still be fixed, though.
+</p>
+</dd>
+<dt>
--whitespace=<action>
</dt>
<dd>
@@ -662,6 +678,16 @@ running <tt>git apply --directory=modules/git-gui</tt>.</p></div> <div class="sectionbody">
<div class="vlist"><dl>
<dt>
+apply.ignorewhitespace
+</dt>
+<dd>
+<p>
+ Set to <em>change</em> if you want changes in whitespace to be ignored by default.
+ Set to one of: no, none, never, false if you want changes in
+ whitespace to be significant.
+</p>
+</dd>
+<dt>
apply.whitespace
</dt>
<dd>
@@ -699,7 +725,7 @@ subdirectory is checked and (if possible) updated.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-01 02:30:42 UTC
+Last updated 2009-08-22 05:10:25 UTC
</div>
</div>
</body>
|