Merge branch 'jn/glossary-revision' into maint

* jn/glossary-revision:
  glossary: a revision is just a commit
This commit is contained in:
Junio C Hamano 2013-05-03 15:12:16 -07:00
commit 49010c354f

View 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