Skip to content

Commit

Permalink
Merge branch 'jn/glossary-revision'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Apr 26, 2013
2 parents 838f9c1 + dfb4410 commit 019eb0d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Documentation/glossary-content.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 019eb0d

Please sign in to comment.