Autogenerated HTML docs for v1.4.4.1-g8ebe

diff --git a/diff-options.txt b/diff-options.txt
index e112172ca57da75ce6c2dd447cc97c6aa2b6499e..9cdd171af74013340144ab60b703498001809502 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -129,5 +129,21 @@
 -a::
        Shorthand for "--text".
 
+--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.
+
+-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
+       line has none.
+
+-w::
+       Shorthand for "--ignore-all-space".
+
 For more detailed explanation on these common options, see also
 link:diffcore.html[diffcore documentation].

diff --git a/git-diff-files.html b/git-diff-files.html
index 8d724d79a3a30de8683f03872c3ad3bbe3984c21..923f6293211e0170054e8dda4b36fb4d4c8aa0a0 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -570,6 +570,42 @@ same as "git-diff-index" and "git-diff-tree".</p>
         Shorthand for "--text".\r
 </p>\r
 </dd>\r
+<dt>\r
+--ignore-space-change\r
+</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
+</p>\r
+</dd>\r
+<dt>\r
+-b\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-space-change".\r
+</p>\r
+</dd>\r
+<dt>\r
+--ignore-all-space\r
+</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
+        line has none.\r
+</p>\r
+</dd>\r
+<dt>\r
+-w\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-all-space".\r
+</p>\r
+</dd>\r
 </dl>\r
 <p>For more detailed explanation on these common options, see also\r
 <a href="diffcore.html">diffcore documentation</a>.</p>\r
@@ -938,7 +974,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Nov-2006 02:22:11 UTC\r
+Last updated 06-Dec-2006 08:58:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 8a39f877bc1a57d46dd1713d8ceb6a459b2204dd..66c5d95067716046200848d7d935c2f49d8e9a64 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -571,6 +571,42 @@ entries in the index are compared.</p>
         Shorthand for "--text".\r
 </p>\r
 </dd>\r
+<dt>\r
+--ignore-space-change\r
+</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
+</p>\r
+</dd>\r
+<dt>\r
+-b\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-space-change".\r
+</p>\r
+</dd>\r
+<dt>\r
+--ignore-all-space\r
+</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
+        line has none.\r
+</p>\r
+</dd>\r
+<dt>\r
+-w\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-all-space".\r
+</p>\r
+</dd>\r
 </dl>\r
 <p>For more detailed explanation on these common options, see also\r
 <a href="diffcore.html">diffcore documentation</a>.</p>\r
@@ -1028,7 +1064,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Nov-2006 02:22:12 UTC\r
+Last updated 06-Dec-2006 08:58:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index 8ecb54099952ac7452420584984c214cbef6a94e..34b70dcbd6c3cb071f1cb69a04c5283a67d7b553 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -568,6 +568,42 @@ unmerged index file.</p>
         Shorthand for "--text".\r
 </p>\r
 </dd>\r
+<dt>\r
+--ignore-space-change\r
+</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
+</p>\r
+</dd>\r
+<dt>\r
+-b\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-space-change".\r
+</p>\r
+</dd>\r
+<dt>\r
+--ignore-all-space\r
+</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
+        line has none.\r
+</p>\r
+</dd>\r
+<dt>\r
+-w\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-all-space".\r
+</p>\r
+</dd>\r
 </dl>\r
 <p>For more detailed explanation on these common options, see also\r
 <a href="diffcore.html">diffcore documentation</a>.</p>\r
@@ -912,7 +948,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Nov-2006 02:22:13 UTC\r
+Last updated 06-Dec-2006 08:58:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index f330ff65b8446dbf1e21808640a349165361a373..2b08f43a103aafc548658d6ad358e7b66d9f78e0 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -573,6 +573,42 @@ git-diff-tree(1) Manual Page
         Shorthand for "--text".\r
 </p>\r
 </dd>\r
+<dt>\r
+--ignore-space-change\r
+</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
+</p>\r
+</dd>\r
+<dt>\r
+-b\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-space-change".\r
+</p>\r
+</dd>\r
+<dt>\r
+--ignore-all-space\r
+</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
+        line has none.\r
+</p>\r
+</dd>\r
+<dt>\r
+-w\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-all-space".\r
+</p>\r
+</dd>\r
 </dl>\r
 <p>For more detailed explanation on these common options, see also\r
 <a href="diffcore.html">diffcore documentation</a>.</p>\r
@@ -1220,7 +1256,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Nov-2006 02:22:14 UTC\r
+Last updated 06-Dec-2006 08:59:00 UTC\r
 </div>\r
 </div>\r
 </body>\r