Merge branch 'maint'

[git.git] / Documentation / glossary.txt

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index cd61aa26065ba6f3d06df7d1c00e2e81d42bce9e..9f446241e2dabee4b93f5c1625351f2260e73717 100644 (file)
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -73,6 +73,11 @@ DAG::
        objects is acyclic (there is no chain which begins and ends with the
        same object).
 
+dangling object::
+       An unreachable object which is not reachable even from other
+       unreachable objects; a dangling object has no references to it
+       from any reference or object in the repository.
+
 dircache::
        You are *waaaaay* behind.
 
@@ -259,7 +264,7 @@ refspec::
        means "grab the master branch head from the $URL and store
        it as my origin branch head".
        And `git push $URL refs/heads/master:refs/heads/to-upstream`
-       means "publish my master branch head as to-upstream master head
+       means "publish my master branch head as to-upstream branch
        at $URL".   See also gitlink:git-push[1]
 
 repository::
@@ -286,6 +291,18 @@ SCM::
 SHA1::
        Synonym for object name.
 
+shallow repository::
+       A shallow repository has an incomplete history some of
+       whose commits have parents cauterized away (in other
+       words, git is told to pretend that these commits do not
+       have the parents, even though they are recorded in the
+       commit object).  This is sometimes useful when you are
+       interested only in the recent history of a project even
+       though the real history recorded in the upstream is
+       much larger.  A shallow repository is created by giving
+       `--depth` option to gitlink:git-clone[1], and its
+       history can be later deepened with gitlink:git-fetch[1].
+
 symref::
        Symbolic reference: instead of containing the SHA1 id itself, it
        is of the format 'ref: refs/some/thing' and when referenced, it
@@ -338,6 +355,10 @@ tag::
 unmerged index::
        An index which contains unmerged index entries.
 
+unreachable object::
+       An object which is not reachable from a branch, tag, or any
+       other reference.
+
 working tree::
        The set of files and directories currently being worked on,
        i.e. you can work in your working tree without using git at all.