Merge branch 'jn/glossary-revision' into maint

* jn/glossary-revision: glossary: a revision is just a commit
git-mirror · May 3, 2013 · 49010c3 · 49010c3
2 parents 6606a69 + dfb4410
commit 49010c3
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
@@ -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