From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>
Subject: [PATCH 0/5] make room for "special ref"
Date: Fri, 15 Dec 2023 12:32:40 -0800 [thread overview]
Message-ID: <20231215203245.3622299-1-gitster@pobox.com> (raw)
Patrick's reftable work is progressing nicely and wants to establish
"special ref" as a phrase with some defined meaning that is somewhat
different from a mere "pseudo ref".
A pseudo ref is merely a normal ref with a funny naming convention,
i.e., being outside the refs/ hierarchy and has names with all
uppercase letters (or an underscore). But there truly are refs that
are more than that. For example, FETCH_HEAD currently stores not
just a single object name, but can and is used to store multiple
object names, each with annotations to record where they came from.
There indeed may be a need to introduce a new term to refer to such
"special refs".
Existing documentation, however, uses "special ref" to refer to
pseudo refs without any "special" property, like FETCH_HEAD does.
This series merely corrects such existing uses of the word, to make
room for Patrick's series to introduce (and formally define in the
glossary) "special refs".
Junio C Hamano (5):
git.txt: HEAD is not that special
git-bisect.txt: BISECT_HEAD is not that special
refs.h: HEAD is not that special
docs: AUTO_MERGE is not that special
docs: MERGE_AUTOSTASH is not that special
Documentation/git-bisect.txt | 2 +-
Documentation/git-diff.txt | 2 +-
Documentation/git-merge.txt | 2 +-
Documentation/git.txt | 7 ++++---
Documentation/merge-options.txt | 2 +-
Documentation/user-manual.txt | 2 +-
refs.h | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
--
2.43.0-76-g1a87c842ec
next reply other threads:[~2023-12-15 20:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-15 20:32 Junio C Hamano [this message]
2023-12-15 20:32 ` [PATCH 1/5] git.txt: HEAD is not that special Junio C Hamano
2023-12-15 21:57 ` Ramsay Jones
2023-12-15 22:06 ` Junio C Hamano
2023-12-15 22:19 ` Junio C Hamano
2023-12-15 22:28 ` [PATCH] doc: format.notes specify a ref under refs/notes/ hierarchy Junio C Hamano
2023-12-18 8:06 ` Patrick Steinhardt
2023-12-18 16:16 ` Junio C Hamano
2023-12-19 15:33 ` Jiang Xin
2023-12-15 22:37 ` [PATCH 1/5] git.txt: HEAD is not that special Ramsay Jones
2023-12-18 8:46 ` Patrick Steinhardt
2023-12-18 16:26 ` Junio C Hamano
2023-12-15 20:32 ` [PATCH 2/5] git-bisect.txt: BISECT_HEAD " Junio C Hamano
2023-12-15 20:32 ` [PATCH 3/5] refs.h: HEAD " Junio C Hamano
2023-12-16 10:03 ` Andy Koppe
2023-12-15 20:32 ` [PATCH 4/5] docs: AUTO_MERGE " Junio C Hamano
2023-12-15 20:32 ` [PATCH 5/5] docs: MERGE_AUTOSTASH " Junio C Hamano
2023-12-16 11:04 ` Andy Koppe
2023-12-15 21:21 ` [PATCH 0/5] make room for "special ref" Junio C Hamano
2023-12-15 22:44 ` Ramsay Jones
2023-12-16 0:44 ` Junio C Hamano
2023-12-18 8:41 ` Patrick Steinhardt
2023-12-16 10:20 ` Andy Koppe
2023-12-18 8:24 ` Patrick Steinhardt
2023-12-16 10:56 ` Andy Koppe
2023-12-18 8:56 ` Patrick Steinhardt
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=20231215203245.3622299-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
/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).