diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:23 -0700 |
| commit | 019eb0dd351ee53b875df27f6748bcb69dc02063 (patch) | |
| tree | 5334f904120cd88bbd82150aad12906ca1c786b9 /Documentation/glossary-content.txt | |
| parent | 838f9c1eb69de6d98889bbdb4d66dfe37e156091 (diff) | |
| parent | dfb44106cdad20d4cf251b31cff154525a291326 (diff) | |
| download | git-019eb0dd351ee53b875df27f6748bcb69dc02063.tar.gz | |
Merge branch 'jn/glossary-revision'
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
Diffstat (limited to 'Documentation/glossary-content.txt')
| -rw-r--r-- | Documentation/glossary-content.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index ce3e4fae73..68a18e1497 100644 --- 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 |