Documentation: bisect: reformat some paragraphs.

[git.git] / Documentation / glossary.txt

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 7e560b0eea83ae7b32e17095f766d84c0b67671f..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).
 
        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.
 
 dircache::
        You are *waaaaay* behind.
 


@@ -188,11 +193,12 @@ octopus::
        predator.
 
 origin::
        predator.
 
 origin::

-       The default upstream tracking branch. Most projects have at
+       The default upstream repository. Most projects have at

        least one upstream project which they track. By default
        'origin' is used for that purpose.  New upstream updates
        least one upstream project which they track. By default
        'origin' is used for that purpose.  New upstream updates

-       will be fetched into this branch; you should never commit
-       to it yourself.
+       will be fetched into remote tracking branches named
+       origin/name-of-upstream-branch, which you can see using
+       "git branch -r".

 
 pack::
        A set of objects which have been compressed into one file (to save
 
 pack::
        A set of objects which have been compressed into one file (to save


@@ -234,8 +240,11 @@ push::
        local head, the push fails.
 
 reachable::
        local head, the push fails.
 
 reachable::

-       An object is reachable from a ref/commit/tree/tag, if there is a
-       chain leading from the latter to the former.
+       All of the ancestors of a given commit are said to be reachable from
+       that commit.  More generally, one object is reachable from another if
+       we can reach the one from the other by a chain that follows tags to
+       whatever they tag, commits to their parents or trees, and trees to the
+       trees or blobs that they contain.

 
 rebase::
        To clean a branch by starting from the head of the main line of
 
 rebase::
        To clean a branch by starting from the head of the main line of


@@ -255,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 "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::
        at $URL".   See also gitlink:git-push[1]
 
 repository::


@@ -282,6 +291,25 @@ SCM::
 SHA1::
        Synonym for object name.
 
 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
+       recursively dereferences to this reference. 'HEAD' is a prime
+       example of a symref. Symbolic references are manipulated with
+       the gitlink:git-symbolic-ref[1] command.
+

 topic branch::
        A regular git branch that is used by a developer to
        identify a conceptual line of development.  Since branches
 topic branch::
        A regular git branch that is used by a developer to
        identify a conceptual line of development.  Since branches


@@ -327,6 +355,10 @@ tag::
 unmerged index::
        An index which contains unmerged index entries.
 
 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.
 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.