diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-03-02 09:14:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-03-02 09:14:51 +0000 |
| commit | 5f32776d3bc48bfda61e2d0586d920bc3baf4b16 (patch) | |
| tree | 40883d389d89cd117b5a3b18894816a07ec285c6 /git-apply.html | |
| parent | adb9128b57d85536fbbb7577a0b0035a6ef9b43d (diff) | |
| download | git-htmldocs-5f32776d3bc48bfda61e2d0586d920bc3baf4b16.tar.gz | |
Autogenerated HTML docs for v1.2.4-gec57
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 65 |
1 files changed, 63 insertions, 2 deletions
diff --git a/git-apply.html b/git-apply.html index 4c1a58e15..e809b6e11 100644 --- a/git-apply.html +++ b/git-apply.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -275,6 +275,7 @@ git-apply(1) Manual Page <div class="verseblock">
<div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
[--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]
+ [--whitespace=<nowarn|warn|error|error-all|strip>]
[<patch>…]</div></div>
</div>
<h2>DESCRIPTION</h2>
@@ -422,6 +423,66 @@ and a work tree.</p> very limited way.
</p>
</dd>
+<dt>
+--whitespace=<option>
+</dt>
+<dd>
+<p>
+ When applying a patch, detect a new or modified line
+ that ends with trailing whitespaces (this includes a
+ line that solely consists of whitespaces). By default,
+ the command outputs warning messages and applies the
+ patch.
+ When <tt>git-apply</tt> is used for statistics and not applying a
+ patch, it defaults to <tt>nowarn</tt>.
+ You can use different <tt><option></tt> to control this
+ behaviour:
+</p>
+<ul>
+<li>
+<p>
+<tt>nowarn</tt> turns off the trailing whitespace warning.
+</p>
+</li>
+<li>
+<p>
+<tt>warn</tt> outputs warnings for a few such errors, but applies the
+ patch (default).
+</p>
+</li>
+<li>
+<p>
+<tt>error</tt> outputs warnings for a few such errors, and refuses
+ to apply the patch.
+</p>
+</li>
+<li>
+<p>
+<tt>error-all</tt> is similar to <tt>error</tt> but shows all errors.
+</p>
+</li>
+<li>
+<p>
+<tt>strip</tt> outputs warnings for a few such errors, strips out the
+ trailing whitespaces and applies the patch.
+</p>
+</li>
+</ul>
+</dd>
+</dl>
+</div>
+<h2>Configuration</h2>
+<div class="sectionbody">
+<dl>
+<dt>
+apply.whitespace
+</dt>
+<dd>
+<p>
+ When no <tt>--whitespace</tt> flag is given from the command
+ line, this configuration item is used as the default.
+</p>
+</dd>
</dl>
</div>
<h2>Author</h2>
@@ -438,7 +499,7 @@ and a work tree.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 31-Jan-2006 16:58:56 PDT
+Last updated 02-Mar-2006 09:14:48 UTC
</div>
</div>
</body>
|