Autogenerated HTML docs for v1.5.3.7-1170-g8d08

diff --git a/diff-format.txt b/diff-format.txt
index 2c3a4c433b2a6d2b0846243a4f1dbebeed45236e..400cbb3b1c120b93278472678ee7bdb87a74f95b 100644 (file)
--- a/diff-format.txt
+++ b/diff-format.txt
@@ -84,3 +84,64 @@ all parents.
 
 
 include::diff-generate-patch.txt[]
+
+
+other diff formats
+------------------
+
+The `--summary` option describes newly added, deleted, renamed and
+copied files.  The `--stat` option adds diffstat(1) graph to the
+output.  These options can be combined with other options, such as
+`-p`, and are meant for human consumption.
+
+When showing a change that involves a rename or a copy, `--stat` output
+formats the pathnames compactly by combining common prefix and suffix of
+the pathnames.  For example, a change that moves `arch/i386/Makefile` to
+`arch/x86/Makefile` while modifying 4 lines will be shown like this:
+
+------------------------------------
+arch/{i386 => x86}/Makefile    |   4 +--
+------------------------------------
+
+The `--numstat` option gives the diffstat(1) information but is designed
+for easier machine consumption.  An entry in `--numstat` output looks
+like this:
+
+----------------------------------------
+1      2       README
+3      1       arch/{i386 => x86}/Makefile
+----------------------------------------
+
+That is, from left to right:
+
+. the number of added lines;
+. a tab;
+. the number of deleted lines;
+. a tab;
+. pathname (possibly with rename/copy information);
+. a newline.
+
+When `-z` output option is in effect, the output is formatted this way:
+
+----------------------------------------
+1      2       README NUL
+3      1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL
+----------------------------------------
+
+That is:
+
+. the number of added lines;
+. a tab;
+. the number of deleted lines;
+. a tab;
+. a NUL (only exists if renamed/copied);
+. pathname in preimage;
+. a NUL (only exists if renamed/copied);
+. pathname in postimage (only exists if renamed/copied);
+. a NUL.
+
+The extra `NUL` before the preimage path in renamed case is to allow
+scripts that read the output to tell if the current record being read is
+a single-path record or a rename/copy record without reading ahead.
+After reading added and deleted lines, reading up to `NUL` would yield
+the pathname, but if that is `NUL`, the record will show two paths.

diff --git a/diff-options.txt b/diff-options.txt
index d0154bbc0a2f868b3f5f1c63dcffd1fc9355ebc3..5d22b7b58c5950fe70d09e0bb7384179ae30220f 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -175,19 +175,19 @@ endif::git-format-patch[]
        Shorthand for "--text".
 
 --ignore-space-at-eol::
-       Ignore changes in white spaces at EOL.
+       Ignore changes in whitespace at EOL.
 
 --ignore-space-change::
-       Ignore changes in amount of white space.  This ignores white
-       space at line end, and consider all other sequences of one or
-       more white space characters to be equivalent.
+       Ignore changes in amount of whitespace.  This ignores whitespace
+       at line end, and considers all other sequences of one or
+       more whitespace characters to be equivalent.
 
 -b::
        Shorthand for "--ignore-space-change".
 
 --ignore-all-space::
-       Ignore white space when comparing lines.  This ignores
-       difference even if one line has white space where the other
+       Ignore whitespace when comparing lines.  This ignores
+       differences even if one line has whitespace where the other
        line has none.
 
 -w::

diff --git a/git-apply.html b/git-apply.html
index 5bea9855305b6620d7da37870d833f0f9fd508eb..b6d6d7fcd952a0ed29d7d50d43af9934b992e5a9 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -461,7 +461,7 @@ discouraged.</p>
 <dd>\r
 <p>\r
         When applying a patch, ignore additions made by the\r
-        patch.  This can be used to extract common part between\r
+        patch.  This can be used to extract the common part between\r
         two files by first running <tt>diff</tt> on them and applying\r
         the result with this option, which would apply the\r
         deletion part but not addition part.\r
@@ -604,7 +604,7 @@ subdirectory is checked and (if possible) updated.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Dec-2007 10:19:06 UTC\r
+Last updated 12-Dec-2007 21:33:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index bae3e7b909736b0827b9fda783d068ade997c466..9ec38f92ba2f9ac51b5cd6ade69758ded31194d6 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -119,7 +119,7 @@ discouraged.
 
 --no-add::
        When applying a patch, ignore additions made by the
-       patch.  This can be used to extract common part between
+       patch.  This can be used to extract the common part between
        two files by first running `diff` on them and applying
        the result with this option, which would apply the
        deletion part but not addition part.

diff --git a/git-diff-files.html b/git-diff-files.html
index 9931e6223ac930fa8223e5f5e7deb6880392b75b..8662cceafc88852ccdfa1e20bdc16811d513b279 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -619,7 +619,7 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in white spaces at EOL.\r
+        Ignore changes in whitespace at EOL.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -627,9 +627,9 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in amount of white space.  This ignores white\r
-        space at line end, and consider all other sequences of one or\r
-        more white space characters to be equivalent.\r
+        Ignore changes in amount of whitespace.  This ignores whitespace\r
+        at line end, and considers all other sequences of one or\r
+        more whitespace characters to be equivalent.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -645,8 +645,8 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore white space when comparing lines.  This ignores\r
-        difference even if one line has white space where the other\r
+        Ignore whitespace when comparing lines.  This ignores\r
+        differences even if one line has whitespace where the other\r
         line has none.\r
 </p>\r
 </dd>\r
@@ -1106,6 +1106,121 @@ two unresolved merge parents with the working tree file
 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka\r
 "their version").</p>\r
 </div>\r
+<h2>other diff formats</h2>\r
+<div class="sectionbody">\r
+<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and\r
+copied files.  The <tt>--stat</tt> option adds diffstat(1) graph to the\r
+output.  These options can be combined with other options, such as\r
+<tt>-p</tt>, and are meant for human consumption.</p>\r
+<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output\r
+formats the pathnames compactly by combining common prefix and suffix of\r
+the pathnames.  For example, a change that moves <tt>arch/i386/Makefile</tt> to\r
+<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>arch/{i386 =&gt; x86}/Makefile    |   4 +--</tt></pre>\r
+</div></div>\r
+<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed\r
+for easier machine consumption.  An entry in <tt>--numstat</tt> output looks\r
+like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README\r
+3       1       arch/{i386 =&gt; x86}/Makefile</tt></pre>\r
+</div></div>\r
+<p>That is, from left to right:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname (possibly with rename/copy information);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a newline.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README NUL\r
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre>\r
+</div></div>\r
+<p>That is:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in preimage;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in postimage (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow\r
+scripts that read the output to tell if the current record being read is\r
+a single-path record or a rename/copy record without reading ahead.\r
+After reading added and deleted lines, reading up to <tt>NUL</tt> would yield\r
+the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>\r
@@ -1120,7 +1235,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Dec-2007 09:49:13 UTC\r
+Last updated 12-Dec-2007 21:33:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 3e139778a2de440a0e00fe2582703072884f2435..1ed884ea4595c33244c7bb4a90306d7e610a12e2 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -620,7 +620,7 @@ entries in the index are compared.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in white spaces at EOL.\r
+        Ignore changes in whitespace at EOL.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -628,9 +628,9 @@ entries in the index are compared.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in amount of white space.  This ignores white\r
-        space at line end, and consider all other sequences of one or\r
-        more white space characters to be equivalent.\r
+        Ignore changes in amount of whitespace.  This ignores whitespace\r
+        at line end, and considers all other sequences of one or\r
+        more whitespace characters to be equivalent.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -646,8 +646,8 @@ entries in the index are compared.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore white space when comparing lines.  This ignores\r
-        difference even if one line has white space where the other\r
+        Ignore whitespace when comparing lines.  This ignores\r
+        differences even if one line has whitespace where the other\r
         line has none.\r
 </p>\r
 </dd>\r
@@ -1094,6 +1094,121 @@ two unresolved merge parents with the working tree file
 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka\r
 "their version").</p>\r
 </div>\r
+<h2>other diff formats</h2>\r
+<div class="sectionbody">\r
+<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and\r
+copied files.  The <tt>--stat</tt> option adds diffstat(1) graph to the\r
+output.  These options can be combined with other options, such as\r
+<tt>-p</tt>, and are meant for human consumption.</p>\r
+<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output\r
+formats the pathnames compactly by combining common prefix and suffix of\r
+the pathnames.  For example, a change that moves <tt>arch/i386/Makefile</tt> to\r
+<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>arch/{i386 =&gt; x86}/Makefile    |   4 +--</tt></pre>\r
+</div></div>\r
+<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed\r
+for easier machine consumption.  An entry in <tt>--numstat</tt> output looks\r
+like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README\r
+3       1       arch/{i386 =&gt; x86}/Makefile</tt></pre>\r
+</div></div>\r
+<p>That is, from left to right:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname (possibly with rename/copy information);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a newline.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README NUL\r
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre>\r
+</div></div>\r
+<p>That is:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in preimage;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in postimage (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow\r
+scripts that read the output to tell if the current record being read is\r
+a single-path record or a rename/copy record without reading ahead.\r
+After reading added and deleted lines, reading up to <tt>NUL</tt> would yield\r
+the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>\r
+</div>\r
 <h2>Operating Modes</h2>\r
 <div class="sectionbody">\r
 <p>You can choose whether you want to trust the index file entirely\r
@@ -1202,7 +1317,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Dec-2007 09:49:14 UTC\r
+Last updated 12-Dec-2007 21:33:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 887133b3c8dc56c18dc5304229388b66028bcbea..d0fc7a44dd02c22afb2bb6c398f897a0c9417078 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -622,7 +622,7 @@ git-diff-tree(1) Manual Page
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in white spaces at EOL.\r
+        Ignore changes in whitespace at EOL.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -630,9 +630,9 @@ git-diff-tree(1) Manual Page
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in amount of white space.  This ignores white\r
-        space at line end, and consider all other sequences of one or\r
-        more white space characters to be equivalent.\r
+        Ignore changes in amount of whitespace.  This ignores whitespace\r
+        at line end, and considers all other sequences of one or\r
+        more whitespace characters to be equivalent.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -648,8 +648,8 @@ git-diff-tree(1) Manual Page
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore white space when comparing lines.  This ignores\r
-        difference even if one line has white space where the other\r
+        Ignore whitespace when comparing lines.  This ignores\r
+        differences even if one line has whitespace where the other\r
         line has none.\r
 </p>\r
 </dd>\r
@@ -1576,6 +1576,121 @@ two unresolved merge parents with the working tree file
 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka\r
 "their version").</p>\r
 </div>\r
+<h2>other diff formats</h2>\r
+<div class="sectionbody">\r
+<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and\r
+copied files.  The <tt>--stat</tt> option adds diffstat(1) graph to the\r
+output.  These options can be combined with other options, such as\r
+<tt>-p</tt>, and are meant for human consumption.</p>\r
+<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output\r
+formats the pathnames compactly by combining common prefix and suffix of\r
+the pathnames.  For example, a change that moves <tt>arch/i386/Makefile</tt> to\r
+<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>arch/{i386 =&gt; x86}/Makefile    |   4 +--</tt></pre>\r
+</div></div>\r
+<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed\r
+for easier machine consumption.  An entry in <tt>--numstat</tt> output looks\r
+like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README\r
+3       1       arch/{i386 =&gt; x86}/Makefile</tt></pre>\r
+</div></div>\r
+<p>That is, from left to right:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname (possibly with rename/copy information);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a newline.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README NUL\r
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre>\r
+</div></div>\r
+<p>That is:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in preimage;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in postimage (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow\r
+scripts that read the output to tell if the current record being read is\r
+a single-path record or a rename/copy record without reading ahead.\r
+After reading added and deleted lines, reading up to <tt>NUL</tt> would yield\r
+the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>\r
@@ -1590,7 +1705,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Dec-2007 09:49:15 UTC\r
+Last updated 12-Dec-2007 21:33:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 6a16c477df6bfcdfec19cd8f9bb464aeb85d86b4..75a99559967f2b33f750b2401525b25b3a54f886 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -698,7 +698,7 @@ and the range notations ("<commit>..<commit>" and
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in white spaces at EOL.\r
+        Ignore changes in whitespace at EOL.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -706,9 +706,9 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in amount of white space.  This ignores white\r
-        space at line end, and consider all other sequences of one or\r
-        more white space characters to be equivalent.\r
+        Ignore changes in amount of whitespace.  This ignores whitespace\r
+        at line end, and considers all other sequences of one or\r
+        more whitespace characters to be equivalent.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -724,8 +724,8 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore white space when comparing lines.  This ignores\r
-        difference even if one line has white space where the other\r
+        Ignore whitespace when comparing lines.  This ignores\r
+        differences even if one line has whitespace where the other\r
         line has none.\r
 </p>\r
 </dd>\r
@@ -1155,6 +1155,121 @@ two unresolved merge parents with the working tree file
 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka\r
 "their version").</p>\r
 </div>\r
+<h2>other diff formats</h2>\r
+<div class="sectionbody">\r
+<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and\r
+copied files.  The <tt>--stat</tt> option adds diffstat(1) graph to the\r
+output.  These options can be combined with other options, such as\r
+<tt>-p</tt>, and are meant for human consumption.</p>\r
+<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output\r
+formats the pathnames compactly by combining common prefix and suffix of\r
+the pathnames.  For example, a change that moves <tt>arch/i386/Makefile</tt> to\r
+<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>arch/{i386 =&gt; x86}/Makefile    |   4 +--</tt></pre>\r
+</div></div>\r
+<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed\r
+for easier machine consumption.  An entry in <tt>--numstat</tt> output looks\r
+like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README\r
+3       1       arch/{i386 =&gt; x86}/Makefile</tt></pre>\r
+</div></div>\r
+<p>That is, from left to right:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname (possibly with rename/copy information);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a newline.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>1       2       README NUL\r
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre>\r
+</div></div>\r
+<p>That is:</p>\r
+<ol>\r
+<li>\r
+<p>\r
+the number of added lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+the number of deleted lines;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a tab;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in preimage;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+pathname in postimage (only exists if renamed/copied);\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+a NUL.\r
+</p>\r
+</li>\r
+</ol>\r
+<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow\r
+scripts that read the output to tell if the current record being read is\r
+a single-path record or a rename/copy record without reading ahead.\r
+After reading added and deleted lines, reading up to <tt>NUL</tt> would yield\r
+the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>\r
+</div>\r
 <h2>EXAMPLES</h2>\r
 <div class="sectionbody">\r
 <dl>\r
@@ -1317,7 +1432,7 @@ Output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Dec-2007 09:49:16 UTC\r
+Last updated 12-Dec-2007 21:33:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.html b/git-format-patch.html
index 889847de5a7442f7130eeeb63e92db9475574236..418908e499c525f77ac0a1606eb8d9ce9534be45 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -666,7 +666,7 @@ reference.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in white spaces at EOL.\r
+        Ignore changes in whitespace at EOL.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -674,9 +674,9 @@ reference.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in amount of white space.  This ignores white\r
-        space at line end, and consider all other sequences of one or\r
-        more white space characters to be equivalent.\r
+        Ignore changes in amount of whitespace.  This ignores whitespace\r
+        at line end, and considers all other sequences of one or\r
+        more whitespace characters to be equivalent.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -692,8 +692,8 @@ reference.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore white space when comparing lines.  This ignores\r
-        difference even if one line has white space where the other\r
+        Ignore whitespace when comparing lines.  This ignores\r
+        differences even if one line has whitespace where the other\r
         line has none.\r
 </p>\r
 </dd>\r
@@ -991,7 +991,7 @@ git-format-patch -3
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Dec-2007 09:49:18 UTC\r
+Last updated 12-Dec-2007 21:33:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index 98ee2d3d7d93db2dd895d99aae97b238a883370c..f22ae219d7866a50ddde5acf8d44ef0c257d7f9d 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -659,7 +659,7 @@ people using 80-column terminals.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in white spaces at EOL.\r
+        Ignore changes in whitespace at EOL.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -667,9 +667,9 @@ people using 80-column terminals.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore changes in amount of white space.  This ignores white\r
-        space at line end, and consider all other sequences of one or\r
-        more white space characters to be equivalent.\r
+        Ignore changes in amount of whitespace.  This ignores whitespace\r
+        at line end, and considers all other sequences of one or\r
+        more whitespace characters to be equivalent.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -685,8 +685,8 @@ people using 80-column terminals.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Ignore white space when comparing lines.  This ignores\r
-        difference even if one line has white space where the other\r
+        Ignore whitespace when comparing lines.  This ignores\r
+        differences even if one line has whitespace where the other\r
         line has none.\r
 </p>\r
 </dd>\r
@@ -1447,7 +1447,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Dec-2007 09:49:18 UTC\r
+Last updated 12-Dec-2007 21:33:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/glossary.html b/glossary.html
index 768dac7375c7c0316b1bf8391402b3e89e588fc1..ba782a9b06327208dafb968e006935e1981f0788 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -698,8 +698,7 @@ This commit is referred to as a "merge commit", or sometimes just a
         The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a>\r
         of the object's contents using the Secure Hash Algorithm\r
         1 and usually represented by the 40 character hexadecimal encoding of\r
-        the <a href="#def_hash">hash</a> of the object (possibly followed by\r
-        a white space).\r
+        the <a href="#def_hash">hash</a> of the object.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1080,7 +1079,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:05 UTC\r
+Last updated 12-Dec-2007 21:33:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/glossary.txt b/glossary.txt
index fc1874424e26a2f95574d72bf3fc1c71a3b1a1b6..65f55e4ced20b7a957b83be3d47764dcfe3238c5 100644 (file)
--- a/glossary.txt
+++ b/glossary.txt
@@ -244,8 +244,7 @@ This commit is referred to as a "merge commit", or sometimes just a
        The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
        of the object's contents using the Secure Hash Algorithm
        1 and usually represented by the 40 character hexadecimal encoding of
-       the <<def_hash,hash>> of the object (possibly followed by
-       a white space).
+       the <<def_hash,hash>> of the object.
 
 [[def_object_type]]object type::
        One of the identifiers

diff --git a/user-manual.html b/user-manual.html
index 0417d839e4540ce5b2d85681497c64f8f06733fd..ee9594bd1b5e82b5946bc458f423d5355f014d4c 100644 (file)
--- a/user-manual.html
+++ b/user-manual.html
@@ -2132,8 +2132,7 @@ This commit is referred to as a "merge commit", or sometimes just a
         The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a>
         of the object's contents using the Secure Hash Algorithm
         1 and usually represented by the 40 character hexadecimal encoding of
-        the <a href="#def_hash">hash</a> of the object (possibly followed by
-        a white space).
+        the <a href="#def_hash">hash</a> of the object.
 </dd><dt><span class="term">
 <a name="def_object_type"></a>object type
 </span></dt><dd>