socksetup: don't return on set_reuse_addr() error

[git.git] / Documentation / glossary.txt

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index eb7b471..02a9d9c 100644 (file)
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -19,8 +19,8 @@ hash::
        In git's context, synonym to object name.
 
 object database::
-       Stores a set of "objects", and an individial object is identified
-       by its object name. The object usually live in $GIT_DIR/objects/.
+       Stores a set of "objects", and an individual object is identified
+       by its object name. The objects usually live in `$GIT_DIR/objects/`.
 
 blob object::
        Untyped object, e.g. the contents of a file.
@@ -43,14 +43,14 @@ DAG::
 
 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
-       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:
@@ -75,7 +75,7 @@ checkout::
        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.
 
@@ -109,15 +109,26 @@ head::
 branch::
        A non-cyclical graph of revisions, i.e. the complete history of
        a particular revision, which is called the branch head. The
-       branch heads are stored in $GIT_DIR/refs/heads/.
+       branch heads are stored in `$GIT_DIR/refs/heads/`.
+
+master::
+       The default branch. Whenever you create a git repository, a branch
+       named "master" is created, and becomes the active branch. In most
+       cases, this contains the local development.
+
+origin::
+       The default upstream branch. Most projects have one upstream
+       project which they track, and by default 'origin' is used for
+       that purpose.  New updates from upstream will be fetched into
+       this branch; you should never commit to it yourself.
 
 ref::
        A 40-byte hex representation of a SHA1 pointing to a particular
-       object. These may be stored in $GIT_DIR/refs/.
+       object. These may be stored in `$GIT_DIR/refs/`.
 
 head ref::
        A ref pointing to a head. Often, this is abbreviated to "head".
-       Head refs are stored in $GIT_DIR/refs/heads/.
+       Head refs are stored in `$GIT_DIR/refs/heads/`.
 
 tree-ish::
        A ref pointing to either a commit object, a tree object, or a
@@ -125,7 +136,7 @@ tree-ish::
 
 ent::
        Favorite synonym to "tree-ish" by some total geeks. See
-       http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
+       `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
        explanation.
 
 tag object::
@@ -137,7 +148,7 @@ tag object::
 tag::
        A ref pointing to a tag or commit object. In contrast to a head,
        a tag is not changed by a commit. Tags (not tag objects) are
-       stored in $GIT_DIR/refs/tags/. A git tag has nothing to do with
+       stored in `$GIT_DIR/refs/tags/`. A git tag has nothing to do with
        a Lisp tag (which is called object type in git's context).
        A tag is most typically used to mark a particular point in the
        commit ancestry chain.