Merge branch 'jn/glossary-revision'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 22:28:23 +0000 (15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 22:28:23 +0000 (15:28 -0700)
The wording for "revision" in the glossary wanted to say it refers
to "commit (noun) as a concept" but it was badly phrased.

This may need further updates to hint that in contexts where it is
clear, the word may refer to an object name, not necessarily a
commit. But the patch as-is is already an improvement.

* jn/glossary-revision:
glossary: a revision is just a commit

Documentation/glossary-content.txt
index ce3e4fae731b6c6c4e67034393309cd20f69b7dc..68a18e14975fadb0cba7ba19e45438887a65bd4f 100644 (file)
@@ -420,9 +420,7 @@ should not be combined with other pathspec.
        <<def_merge,merge>> left behind.
 
 [[def_revision]]revision::
-       A particular state of files and directories which was stored in the
-       <<def_object_database,object database>>. It is referenced by a
-       <<def_commit_object,commit object>>.
+       Synonym for <<def_commit,commit>> (the noun).
 
 [[def_rewind]]rewind::
        To throw away part of the development, i.e. to assign the