git-clone --shared should imply --local

[git.git] / Documentation / glossary.txt

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index a069b7b..07df6b4 100644 (file)
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -1,5 +1,5 @@
 object::
 object::

-       The unit of storage in GIT. It is uniquely identified by
+       The unit of storage in git. It is uniquely identified by

        the SHA1 of its contents. Consequently, an object can not
        be changed.
 
        the SHA1 of its contents. Consequently, an object can not
        be changed.
 


@@ -43,14 +43,14 @@ DAG::
 
 index::
        A collection of files with stat information, whose contents are
 
 index::
        A collection of files with stat information, whose contents are

-       stored as objects. The cache is a stored version of your working
+       stored as objects. The index is a stored version of your working

        tree. Truth be told, it can also contain a second, and even a third
        version of a working tree, which are used when merging.
 
 index entry::
        The information regarding a particular file, stored in the index.
        An index entry can be unmerged, if a merge was started, but not
        tree. Truth be told, it can also contain a second, and even a third
        version of a working tree, which are used when merging.
 
 index entry::
        The information regarding a particular file, stored in the index.
        An index entry can be unmerged, if a merge was started, but not

-       yet finished (i.e. if the cache contains multiple versions of
+       yet finished (i.e. if the index contains multiple versions of

        that file).
 
 unmerged index:
        that file).
 
 unmerged index:


@@ -75,7 +75,7 @@ checkout::
        stored in the object database.
 
 commit::
        stored in the object database.
 
 commit::

-       As a verb: The action of storing the current state of the cache in the
+       As a verb: The action of storing the current state of the index in the

        object database. The result is a revision.
        As a noun: Short hand for commit object.
 
        object database. The result is a revision.
        As a noun: Short hand for commit object.