Merge git://repo.or.cz/git-gui

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index fc1874424e26a2f95574d72bf3fc1c71a3b1a1b6..65f55e4ced20b7a957b83be3d47764dcfe3238c5 100644 (file)
--- 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