summaryrefslogtreecommitdiffstats
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-14 09:41:32 +0100
committerJunio C Hamano <junkio@cox.net>2007-02-14 09:41:32 +0100
commita44a0c9966dd83bfc0c1fada1896f98fbf4170a6 (patch)
treec632e51a4976ee1b9b886a41d42491912363b292 /Documentation/diff-options.txt
parentMerge branch 'maint' (diff)
downloadgit-a44a0c9966dd83bfc0c1fada1896f98fbf4170a6.tar.xz
git-a44a0c9966dd83bfc0c1fada1896f98fbf4170a6.zip
Document --ignore-space-at-eol option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 019a39f2bf..d8696b7b36 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -140,6 +140,9 @@
-a::
Shorthand for "--text".
+--ignore-space-at-eol::
+ Ignore changes in white spaces 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