From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 2 Mar 2006 09:14:51 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.2.4-gec57
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5f32776d3bc48bfda61e2d0586d920bc3baf4b16;hp=adb9128b57d85536fbbb7577a0b0035a6ef9b43d;p=git.git

Autogenerated HTML docs for v1.2.4-gec57
---

diff --git a/git-am.html b/git-am.html
index 781ac0f1..087684b3 100644
--- a/git-am.html
+++ b/git-am.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 {
@@ -273,7 +273,8 @@ git-am(1) Manual Page
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8] [--binary] [--3way] &lt;mbox&gt;&#8230;
+<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8] [--binary] [--3way]
+         [--interactive] [--whitespace=&lt;option&gt;] &lt;mbox&gt;&#8230;
 <em>git-am</em> [--skip | --resolved]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
@@ -342,6 +343,15 @@ current branch.</p>
 </p>
 </dd>
 <dt>
+--whitespace=&lt;option&gt;
+</dt>
+<dd>
+<p>
+        This flag is passed to the <tt>git-apply</tt> program that applies
+        the patch.
+</p>
+</dd>
+<dt>
 --interactive
 </dt>
 <dd>
@@ -392,7 +402,7 @@ names.</p>
 </div>
 <h2>SEE ALSO</h2>
 <div class="sectionbody">
-<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>
+<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>, <a href="git-apply.html">git-apply(1)</a>.</p>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
@@ -408,7 +418,7 @@ names.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:11:59 PDT
+Last updated 02-Mar-2006 09:14:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-am.txt b/git-am.txt
index 02cabc93..910457d3 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -9,7 +9,8 @@ git-am - Apply a series of patches in a mailbox
 SYNOPSIS
 --------
 [verse]
-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
+'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+         [--interactive] [--whitespace=<option>] <mbox>...
 'git-am' [--skip | --resolved]
 
 DESCRIPTION
@@ -46,6 +47,10 @@ OPTIONS
 	Skip the current patch.  This is only meaningful when
 	restarting an aborted patch.
 
+--whitespace=<option>::
+	This flag is passed to the `git-apply` program that applies
+	the patch.
+
 --interactive::
 	Run interactively, just like git-applymbox.
 
@@ -80,7 +85,7 @@ names.
 
 SEE ALSO
 --------
-gitlink:git-applymbox[1], gitlink:git-applypatch[1].
+gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
 
 
 Author
diff --git a/git-apply.html b/git-apply.html
index 4c1a58e1..e809b6e1 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=&lt;nowarn|warn|error|error-all|strip&gt;]
           [&lt;patch&gt;&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
@@ -422,6 +423,66 @@ and a work tree.</p>
         very limited way.
 </p>
 </dd>
+<dt>
+--whitespace=&lt;option&gt;
+</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>&lt;option&gt;</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>
diff --git a/git-apply.txt b/git-apply.txt
index 75076b61..1c64a1aa 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 [verse]
 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
 	  [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]
+	  [--whitespace=<nowarn|warn|error|error-all|strip>]
 	  [<patch>...]
 
 DESCRIPTION
@@ -97,6 +98,35 @@ OPTIONS
 	result.  This allows binary files to be patched in a
 	very limited way.
 
+--whitespace=<option>::
+	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 `git-apply` is used for statistics and not applying a
+	patch, it defaults to `nowarn`.
+	You can use different `<option>` to control this
+	behaviour:
++
+* `nowarn` turns off the trailing whitespace warning.
+* `warn` outputs warnings for a few such errors, but applies the
+  patch (default).
+* `error` outputs warnings for a few such errors, and refuses
+  to apply the patch.
+* `error-all` is similar to `error` but shows all errors.
+* `strip` outputs warnings for a few such errors, strips out the
+  trailing whitespaces and applies the patch.
+
+
+Configuration
+-------------
+
+apply.whitespace::
+	When no `--whitespace` flag is given from the command
+	line, this configuration item is used as the default.
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
diff --git a/git-read-tree.html b/git-read-tree.html
index a5bd09f3..fa551cf2 100644
--- a/git-read-tree.html
+++ b/git-read-tree.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 {
@@ -272,7 +272,7 @@ git-read-tree(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m | --reset] [-u | -i]] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>
+<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m [--aggressive]| --reset] [-u | -i]] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -333,6 +333,37 @@ will be in unmerged state when <tt>git-read-tree</tt> returns.</p>
 </p>
 </dd>
 <dt>
+--aggressive
+</dt>
+<dd>
+<p>
+        Usually a three-way merge by <tt>git-read-tree</tt> resolves
+        the merge for really trivial cases and leaves other
+        cases unresolved in the index, so that Porcelains can
+        implement different merge policies.  This flag makes the
+        command to resolve a few more cases internally:
+</p>
+<ul>
+<li>
+<p>
+when one side removes a path and the other side leaves the path
+  unmodified.  The resolution is to remove that path.
+</p>
+</li>
+<li>
+<p>
+when both sides remove a path.  The resolution is to remove that path.
+</p>
+</li>
+<li>
+<p>
+when both sides adds a path identically.  The resolution
+  is to add that path.
+</p>
+</li>
+</ul>
+</dd>
+<dt>
 &lt;tree-ish#&gt;
 </dt>
 <dd>
@@ -618,7 +649,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:16:31 PDT
+Last updated 02-Mar-2006 09:14:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-read-tree.txt b/git-read-tree.txt
index 6fbd6d93..844cfda8 100644
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index
 
 SYNOPSIS
 --------
-'git-read-tree' (<tree-ish> | [[-m | --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'git-read-tree' (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
 
 
 DESCRIPTION
@@ -50,6 +50,19 @@ OPTIONS
 	trees that are not directly related to the current
 	working tree status into a temporary index file.
 
+--aggressive::
+	Usually a three-way merge by `git-read-tree` resolves
+	the merge for really trivial cases and leaves other
+	cases unresolved in the index, so that Porcelains can
+	implement different merge policies.  This flag makes the
+	command to resolve a few more cases internally:
++
+* when one side removes a path and the other side leaves the path
+  unmodified.  The resolution is to remove that path.
+* when both sides remove a path.  The resolution is to remove that path.
+* when both sides adds a path identically.  The resolution
+  is to add that path.
+
 <tree-ish#>::
 	The id of the tree object(s) to be read/merged.
 
diff --git a/git-rev-list.html b/git-rev-list.html
index 0b361a22..b1a6bbb7 100644
--- a/git-rev-list.html
+++ b/git-rev-list.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 {
@@ -282,7 +282,7 @@ git-rev-list(1) Manual Page
              [ --all ]
              [ [ --merge-order [ --show-breaks ] ] | [ --topo-order ] ]
              [ --parents ]
-             [ --objects [ --unpacked ] ]
+             [ [--objects | --objects-edge] [ --unpacked ] ]
              [ --pretty | --header ]
              [ --bisect ]
              &lt;commit&gt;&#8230; [ -- &lt;paths&gt;&#8230; ]</div></div>
@@ -331,6 +331,19 @@ short-hand for ^&lt;commit1&gt; &lt;commit2&gt;.</p>
 </p>
 </dd>
 <dt>
+--objects-edge
+</dt>
+<dd>
+<p>
+        Similar to <tt>--objects</tt>, but also print the IDs of
+        excluded commits refixed with a <tt>-</tt> character.  This is
+        used by <tt>git-pack-objects</tt> to build <em>thin</em> pack, which
+        records objects in deltified form based on objects
+        contained in these excluded commits to reduce network
+        traffic.
+</p>
+</dd>
+<dt>
 --unpacked
 </dt>
 <dd>
@@ -483,7 +496,7 @@ represent an arbitrary DAG in a linear form.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 28-Jan-2006 00:54:44 PDT
+Last updated 02-Mar-2006 09:14:49 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-list.txt b/git-rev-list.txt
index 1c6146c7..27f18e2c 100644
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -18,7 +18,7 @@ SYNOPSIS
 	     [ \--all ]
 	     [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
 	     [ \--parents ]
-	     [ \--objects [ \--unpacked ] ]
+	     [ [\--objects | \--objects-edge] [ \--unpacked ] ]
 	     [ \--pretty | \--header ]
 	     [ \--bisect ]
 	     <commit>... [ \-- <paths>... ]
@@ -53,6 +53,14 @@ OPTIONS
 	which I need to download if I have the commit object 'bar', but
 	not 'foo'".
 
+--objects-edge::
+	Similar to `--objects`, but also print the IDs of
+	excluded commits refixed with a `-` character.  This is
+	used by `git-pack-objects` to build 'thin' pack, which
+	records objects in deltified form based on objects
+	contained in these excluded commits to reduce network
+	traffic.
+
 --unpacked::
 	Only useful with `--objects`; print the object IDs that
 	are not in packs.
