Skip to content

Commit 8ebe185

Browse files
jnarebJunio C Hamano
authored andcommitted
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 0d21efa, "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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c7c2488 commit 8ebe185

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

Documentation/diff-options.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,21 @@
129129
-a::
130130
Shorthand for "--text".
131131

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+
132148
For more detailed explanation on these common options, see also
133149
link:diffcore.html[diffcore documentation].

0 commit comments

Comments
 (0)