summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-05-03 15:12:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-03 15:12:16 -0700
commit49010c354f817457d0f7b26909a617316a4b8d48 (patch)
treea279849070da6c45aeadf10b3b30bcce15eae130 /Documentation
parentcompletion: zsh: don't override suffix on _detault (diff)
parentglossary: a revision is just a commit (diff)
downloadtgif-49010c354f817457d0f7b26909a617316a4b8d48.tar.xz
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.txt4
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