aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-12-12 09:12:01 +0100
committerJunio C Hamano <gitster@pobox.com>2007-12-12 10:59:22 -0800
commit0ac7903ee3c7c93d2426a4aa4f3732bee73e0365 (patch)
tree5f01de39e619c19b0e6857f5b9db94bc4fc1b0d9
parent472b25709900723a35b404456ae8e28bfc446932 (diff)
downloadgit-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.tar.gz
git-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.tar.xz
Use "whitespace" consistently
For consistency, change "white space" and "whitespaces" to "whitespace", fixing a couple of adjacent grammar problems in the docs. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/diff-options.txt12
-rw-r--r--Documentation/glossary.txt3
-rw-r--r--diff.c4
3 files changed, 9 insertions, 10 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index d0154bbc0..5d22b7b58 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -175,19 +175,19 @@ endif::git-format-patch[]
Shorthand for "--text".
--ignore-space-at-eol::
- Ignore changes in white spaces at EOL.
+ Ignore changes in whitespace 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
- more white space characters to be equivalent.
+ Ignore changes in amount of whitespace. This ignores whitespace
+ at line end, and considers all other sequences of one or
+ more whitespace 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
+ Ignore whitespace when comparing lines. This ignores
+ differences even if one line has whitespace where the other
line has none.
-w::
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index fc1874424..65f55e4ce 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -244,8 +244,7 @@ This commit is referred to as a "merge commit", or sometimes just a
The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
of the object's contents using the Secure Hash Algorithm
1 and usually represented by the 40 character hexadecimal encoding of
- the <<def_hash,hash>> of the object (possibly followed by
- a white space).
+ the <<def_hash,hash>> of the object.
[[def_object_type]]object type::
One of the identifiers
diff --git a/diff.c b/diff.c
index f780e3e8e..e74a30399 100644
--- a/diff.c
+++ b/diff.c
@@ -1015,7 +1015,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
if (line[i - 1] == '\t' && spaces)
space_before_tab = 1;
- /* check white space at line end */
+ /* check whitespace at line end */
if (line[len - 1] == '\n')
len--;
if (isspace(line[len - 1]))
@@ -1029,7 +1029,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
putchar(',');
}
if (white_space_at_end)
- printf("white space at end");
+ printf("whitespace at end");
printf(":%s ", reset);
emit_line_with_ws(1, set, reset, ws, line, len,
data->ws_rule);