X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary-content.txt;h=3595b586bc35d865a08ab538a1908cb2abe8e1a8;hb=07b88a00c0caac055a9f52167523248a75711842;hp=8f62d1abeeb9b80fd36aa8ea12120c640a98414e;hpb=2951df7a9afd1dc17bbca62af4bde340e1d9368f;p=git.git diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 8f62d1abe..3595b586b 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -161,8 +161,8 @@ to point at the new commit. [[def_head]]head:: A <> to the <> at the tip of a - <>. Heads are stored in - `$GIT_DIR/refs/heads/`, except when using packed refs. (See + <>. Heads are stored in a file in + `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].) [[def_HEAD]]HEAD:: @@ -170,8 +170,8 @@ to point at the new commit. working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a - <>, in which case it may - reference an arbitrary commit. + <>, in which case it directly + references an arbitrary commit. [[def_head_ref]]head ref:: A synonym for <>. @@ -382,8 +382,9 @@ should not be combined with other pathspec. [[def_ref]]ref:: A 40-byte hex representation of a <> or a name that - denotes a particular <>. These may be stored in - `$GIT_DIR/refs/`. + denotes a particular <>. They may be stored in + a file under `$GIT_DIR/refs/` directory, or + in the `$GIT_DIR/packed-refs` file. [[def_reflog]]reflog:: A reflog shows the local "history" of a ref. In other words, @@ -459,14 +460,14 @@ should not be combined with other pathspec. command. [[def_tag]]tag:: - A <> pointing to a <> or - <>. In contrast to a <>, - a tag is not changed by a <>. Tags (not - <>) are stored in `$GIT_DIR/refs/tags/`. A - git tag has nothing to do with a Lisp tag (which would be - called an <> in git's context). A - tag is most typically used to mark a particular point in the - commit ancestry <>. + A <> under `refs/tags/` namespace that points to an + object of an arbitrary type (typically a tag points to either a + <> or a <>). + In contrast to a <>, a tag is not updated by + the `commit` command. A git tag has nothing to do with a Lisp + tag (which would be called an <> + in git's context). A tag is most typically used to mark a particular + point in the commit ancestry <>. [[def_tag_object]]tag object:: An <> containing a <> pointing to