summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-12-12 08:12:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-12 18:59:22 (GMT)
commit0ac7903ee3c7c93d2426a4aa4f3732bee73e0365 (patch)
tree5f01de39e619c19b0e6857f5b9db94bc4fc1b0d9 /Documentation/glossary.txt
parent472b25709900723a35b404456ae8e28bfc446932 (diff)
downloadgit-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.zip
git-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.tar.gz
git-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.tar.bz2
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>
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index fc18744..65f55e4 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