Use "whitespace" consistently
Most of the messages and documentation use 'whitespace' rather than 'white space' or 'white spaces' convert to latter two to the former for consistency. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Nov 23, 2018 at 11:16 UTC
748aa1aa34a316b8f26a3664f3fdcd273e1c5c39
3 files changed
+7
-7
Documentation/diff-options.txt
+2
-2
@@ -298,7 +298,7 @@ dimmed-zebra::
298
settings. It is the same as `--color-moved=no`.
299
300
--color-moved-ws=<modes>::
301
- This configures how white spaces are ignored when performing the
301
+ This configures how whitespace is ignored when performing the
302
move detection for `--color-moved`.
303
ifdef::git-diff[]
304
It can be set by the `diff.colorMovedWS` configuration setting.
@@ -316,7 +316,7 @@ ignore-all-space::
316
Ignore whitespace when comparing lines. This ignores differences
317
even if one line has whitespace where the other line has none.
318
allow-indentation-change::
319
- Initially ignore any white spaces in the move detection, then
319
+ Initially ignore any whitespace in the move detection, then
320
group the moved code blocks only into a block if the change in
321
whitespace is the same per line. This is incompatible with the
322
other modes.
Documentation/git-cat-file.txt
+4
-4
@@ -23,8 +23,8 @@ In the second form, a list of objects (separated by linefeeds) is provided on
23
stdin, and the SHA-1, type, and size of each object is printed on stdout. The
24
output format can be overridden using the optional `<format>` argument. If
25
either `--textconv` or `--filters` was specified, the input is expected to
26
-list the object names followed by the path name, separated by a single white
27
-space, so that the appropriate drivers can be determined.
26
+list the object names followed by the path name, separated by a single
27
+whitespace, so that the appropriate drivers can be determined.
28
29
OPTIONS
30
-------
@@ -79,7 +79,7 @@ OPTIONS
79
Print object information and contents for each object provided
80
on stdin. May not be combined with any other options or arguments
81
except `--textconv` or `--filters`, in which case the input lines
82
- also need to specify the path, separated by white space. See the
82
+ also need to specify the path, separated by whitespace. See the
83
section `BATCH OUTPUT` below for details.
84
85
--batch-check::
@@ -87,7 +87,7 @@ OPTIONS
87
Print object information for each object provided on stdin. May
88
not be combined with any other options or arguments except
89
`--textconv` or `--filters`, in which case the input lines also
90
- need to specify the path, separated by white space. See the
90
+ need to specify the path, separated by whitespace. See the
91
section `BATCH OUTPUT` below for details.
92
93
--batch-all-objects::
diff.c
+1
-1
@@ -320,7 +320,7 @@ static int parse_color_moved_ws(const char *arg)
320
321
if ((ret & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) &&
322
(ret & XDF_WHITESPACE_FLAGS))
323
- die(_("color-moved-ws: allow-indentation-change cannot be combined with other white space modes"));
323
+ die(_("color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes"));
324
325
string_list_clear(&l, 0);
326