diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-04 02:12:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-04 02:12:16 +0400 |
| commit | 49010c354f817457d0f7b26909a617316a4b8d48 (patch) | |
| tree | a279849070da6c45aeadf10b3b30bcce15eae130 /Documentation | |
| parent | 6606a69f451ebbed5692185938be55aea6e8f49f (diff) | |
| parent | dfb44106cdad20d4cf251b31cff154525a291326 (diff) | |
Merge branch 'jn/glossary-revision' into maint
* jn/glossary-revision:
glossary: a revision is just a commit
Diffstat (limited to 'Documentation')
| -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 |