From: Junio C Hamano Date: Wed, 6 Dec 2006 08:59:07 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.4.1-g8ebe X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9c2d2f993a6e580d6be0687180d04186d3a05f0;p=git.git Autogenerated HTML docs for v1.4.4.1-g8ebe --- diff --git a/diff-options.txt b/diff-options.txt index e112172ca..9cdd171af 100644 --- 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 8d724d79a..923f62932 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -570,6 +570,42 @@ same as "git-diff-index" and "git-diff-tree".

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 diffcore documentation.

@@ -938,7 +974,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 8a39f877b..66c5d9506 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -571,6 +571,42 @@ entries in the index are compared.

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 diffcore documentation.

@@ -1028,7 +1064,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 8ecb54099..34b70dcbd 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -568,6 +568,42 @@ unmerged index file.

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 diffcore documentation.

@@ -912,7 +948,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index f330ff65b..2b08f43a1 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -573,6 +573,42 @@ git-diff-tree(1) Manual Page 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 diffcore documentation.

@@ -1220,7 +1256,7 @@ two unresolved merge parents with the working tree file