summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-12-06 08:59:07 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-12-06 08:59:07 +0000
commitd9c2d2f993a6e580d6be0687180d04186d3a05f0 (patch)
tree4d8fbbba2b6ca79cb8b04c902d626e0c812453d9 /diff-options.txt
parenta20b40767b5186ae2b96b221016b4034f7d58751 (diff)
downloadgit-htmldocs-d9c2d2f993a6e580d6be0687180d04186d3a05f0.tar.gz
Autogenerated HTML docs for v1.4.4.1-g8ebe
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt16
1 files changed, 16 insertions, 0 deletions
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].