@matheusbsbs / matheus-bagliano / commits / 8ebe185bbf
Fork 0

Document git-diff whitespace flags -b and -w

Document git diff options -b / --ignore-space-change and -w / --ignore-all-space, introduced by Johannes Schindelin in commit 0d21efa5, "Teach diff about -b and -w flags". The description of options is taken from GNU diff man page and GNU Diffutils info documentation. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed Dec 3, 2006 at 17:24 UTC 8ebe185bbf3f1f4f59bcc61e3d1849a76f6af983
1 file changed +16
Documentation/diff-options.txt
+16
@@ -129,5 +129,21 @@
129 -a::
130 Shorthand for "--text".
131
132 +--ignore-space-change::
133 + Ignore changes in amount of white space. This ignores white
134 + space at line end, and consider all other sequences of one or
135 + more white space characters to be equivalent.
136 +
137 +-b::
138 + Shorthand for "--ignore-space-change".
139 +
140 +--ignore-all-space::
141 + Ignore white space when comparing lines. This ignores
142 + difference even if one line has white space where the other
143 + line has none.
144 +
145 +-w::
146 + Shorthand for "--ignore-all-space".
147 +
148 For more detailed explanation on these common options, see also
149 link:diffcore.html[diffcore documentation].