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>

Documentation/diff-options.txt

@@ -175,11 +175,11 @@ 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
+	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::
@@ -187,7 +187,7 @@ endif::git-format-patch[]
 
 --ignore-all-space::
 	Ignore whitespace when comparing lines.  This ignores
-	difference even if one line has white space where the other
+	differences even if one line has whitespace where the other
 	line has none.
 
 -w::

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