From: Patrick Steinhardt <ps@pks.im>
To: Andy Koppe <andy.koppe@gmail.com>
Cc: git@vger.kernel.org, Karthik Nayak <karthik.188@gmail.com>,
Julia Evans <julia@jvns.ca>
Subject: Re: [PATCH v2 2/5] doc: glossary: update per-worktree refs
Date: Tue, 3 Nov 2026 12:29:54 +0100 [thread overview]
Message-ID: <aunFsp6B2rNJCXTi@pks.im> (raw)
In-Reply-To: <20261101230326.3675597-3-andy.koppe@gmail.com>
On Sun, Nov 01, 2026 at 11:03:20PM +0000, Andy Koppe wrote:
[snip]
> Bring the list up to date, and refer to git-worktree(1) for how to
> access per-worktree refs of other worktrees. In the "worktree" entry,
> describe HEAD as a per-worktree ref and MERGE_HEAD as a pseudoref,
> rather than listing them separately from per-worktree refs.
This doesn't match what you're doing anymore, as you don't mention
MERGE_HEAD at all anymore.
> diff --git a/Documentation/glossary-content.adoc b/Documentation/glossary-content.adoc
> index f905b4467b..67fe49b26d 100644
> --- a/Documentation/glossary-content.adoc
> +++ b/Documentation/glossary-content.adoc
> @@ -791,5 +804,5 @@ and pseudorefs.
> "working tree" and repository metadata, most of which are
> shared among other worktrees of a single repository, and
> some of which are maintained separately per worktree
> - (e.g. the index, HEAD and pseudorefs like MERGE_HEAD,
> - per-worktree refs and per-worktree configuration file).
> + (e.g. the index, <<def_per_worktree_ref,per-worktree refs>>, and the
> + per-worktree configuration file).
Patrick
next prev parent reply other threads:[~2026-11-03 11:29 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-22 21:28 [PATCH 0/5] root refs vs pseudorefs Andy Koppe
2026-10-22 21:28 ` [PATCH 1/5] doc: glossary: add root ref and clarify pseudorefs Andy Koppe
2026-10-22 22:07 ` Junio C Hamano
2026-10-23 7:41 ` Patrick Steinhardt
2026-11-01 23:18 ` Andy Koppe
2026-10-22 21:28 ` [PATCH 2/5] doc: glossary: update per-worktree refs Andy Koppe
2026-10-23 7:41 ` Patrick Steinhardt
2026-11-01 23:26 ` Andy Koppe
2026-10-22 21:28 ` [PATCH 3/5] doc: stop calling root refs pseudorefs Andy Koppe
2026-10-23 7:41 ` Patrick Steinhardt
2026-11-01 23:44 ` Andy Koppe
2026-10-22 21:28 ` [PATCH 4/5] refs: " Andy Koppe
2026-10-23 7:41 ` Patrick Steinhardt
2026-11-01 23:46 ` Andy Koppe
2026-10-22 21:28 ` [PATCH 5/5] t: " Andy Koppe
2026-10-22 22:18 ` [PATCH 0/5] root refs vs pseudorefs Junio C Hamano
2026-10-23 13:21 ` Julia Evans
2026-11-01 23:07 ` Andy Koppe
2026-11-01 23:03 ` [PATCH v2 " Andy Koppe
2026-11-02 18:19 ` Julia Evans
2026-11-02 19:47 ` Andy Koppe
2026-11-02 21:00 ` Julia Evans
2026-11-02 22:19 ` Andy Koppe
2026-11-03 14:36 ` Julia Evans
2026-11-02 21:49 ` Junio C Hamano
2026-11-01 23:03 ` [PATCH v2 1/5] doc: glossary: add root ref and clarify pseudorefs Andy Koppe
2026-11-03 11:29 ` Patrick Steinhardt
2026-11-03 18:30 ` Junio C Hamano
2026-11-01 23:03 ` [PATCH v2 2/5] doc: glossary: update per-worktree refs Andy Koppe
2026-11-03 11:29 ` Patrick Steinhardt [this message]
2026-11-01 23:03 ` [PATCH v2 3/5] doc: stop calling root refs pseudorefs Andy Koppe
2026-11-03 11:30 ` Patrick Steinhardt
2026-11-01 23:03 ` [PATCH v2 4/5] refs: " Andy Koppe
2026-11-01 23:03 ` [PATCH v2 5/5] t: " Andy Koppe
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=aunFsp6B2rNJCXTi@pks.im \
--to=ps@pks.im \
--cc=andy.koppe@gmail.com \
--cc=git@vger.kernel.org \
--cc=julia@jvns.ca \
--cc=karthik.188@gmail.com \
/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