From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 4/5] glossary: update description of head and ref
Date: Thu, 23 Jun 2011 09:52:37 -0700 [thread overview]
Message-ID: <1308847958-3429-5-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1308847958-3429-1-git-send-email-gitster@pobox.com>
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 | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index c437f34..dd690bd 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,
--
1.7.6.rc3
next prev parent reply other threads:[~2011-06-23 16:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 4:45 [PATCH] git-remote.txt: fix wrong remote refspec Namhyung Kim
2011-06-23 5:35 ` Junio C Hamano
2011-06-23 6:17 ` Namhyung Kim
2011-06-23 8:12 ` [PATCH v2] " Namhyung Kim
2011-06-23 15:33 ` [PATCH] " Junio C Hamano
2011-06-23 16:03 ` Namhyung Kim
2011-06-23 16:52 ` [PATCH 0/5] Clarify "refs" Junio C Hamano
2011-06-23 16:52 ` [PATCH 1/5] check-ref-format doc: de-emphasize the implementation detail of a ref Junio C Hamano
2011-06-23 22:14 ` Eric Sunshine
2011-06-23 16:52 ` [PATCH 2/5] git.txt: " Junio C Hamano
2011-06-23 16:52 ` [PATCH 3/5] glossary: update description of "tag" Junio C Hamano
2011-06-23 22:19 ` Eric Sunshine
2011-06-23 16:52 ` Junio C Hamano [this message]
2011-06-23 16:52 ` [PATCH 5/5] glossary: clarify description of HEAD Junio C Hamano
2011-06-23 17:06 ` Carlos Martín Nieto
2011-06-23 17:12 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308847958-3429-5-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).