aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-23 09:47:28 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-23 15:39:28 -0700
commitdeaef1e94734a61407c73637e0e9718f914c3a62 (patch)
tree43a55b9fc4f3dc35af953486c956e47cc7261c5d
parent487b04411d625ff912543e4313a3343db62429e4 (diff)
downloadgit-deaef1e94734a61407c73637e0e9718f914c3a62.tar.gz
git-deaef1e94734a61407c73637e0e9718f914c3a62.tar.xz
glossary: update description of head and ref
Reword them to avoid sounding as if loose refs are the only ones in the world. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/glossary-content.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 878de2115..f43006846 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 <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a
- <<def_branch,branch>>. Heads are stored in
- `$GIT_DIR/refs/heads/`, except when using packed refs. (See
+ <<def_branch,branch>>. 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::
@@ -350,8 +350,9 @@ including Documentation/chapter_1/figure_1.jpg.
[[def_ref]]ref::
A 40-byte hex representation of a <<def_SHA1,SHA1>> or a name that
- denotes a particular <<def_object,object>>. These may be stored in
- `$GIT_DIR/refs/`.
+ denotes a particular <<def_object,object>>. 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,