Browse Source

Documentation(glossary): minor formatting clean-ups.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
12bd7e78ee
  1. 12
      Documentation/glossary.txt
  2. 1
      Documentation/sort_glossary.pl

12
Documentation/glossary.txt

@ -20,7 +20,7 @@ hash:: @@ -20,7 +20,7 @@ hash::

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/.
by its object name. The objects usually live in `$GIT_DIR/objects/`.

blob object::
Untyped object, e.g. the contents of a file.
@ -109,15 +109,15 @@ head:: @@ -109,15 +109,15 @@ 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/`.

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 +125,7 @@ tree-ish:: @@ -125,7 +125,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 +137,7 @@ tag object:: @@ -137,7 +137,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.

1
Documentation/sort_glossary.pl

@ -42,7 +42,6 @@ sub no_spaces ($) { @@ -42,7 +42,6 @@ sub no_spaces ($) {

print 'GIT Glossary
============
Aug 2005

This list is sorted alphabetically:


Loading…
Cancel
Save