Re: [PATCH v2 2/5] doc: glossary: update per-worktree refs
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Nov 3, 2026, 11:29 UTC
- Message-ID
- <aunFsp6B2rNJCXTi@pks.im>
- 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.
Show 12 quoted lines
> 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