Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
glossary: update description of head and ref
author
Junio C Hamano
<gitster@pobox.com>
Thu, 23 Jun 2011 16:47:28 +0000
(09:47 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 23 Jun 2011 22:39:28 +0000
(15:39 -0700)
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>
Documentation/glossary-content.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
487b044
)
diff --git
a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index 878de2115927fa35d8416d44d87982523320238a..f4300684679c7a5ef06ae4cb7be7ff8ee64bb64c 100644
(file)
--- 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_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::
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
[[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,
[[def_reflog]]reflog::
A reflog shows the local "history" of a ref. In other words,