Thread (1 message) 1 message, 1 author, 2022-02-09

Re: [PATCH v6 1/6] Documentation: add extensions.worktreeConfig details

From: Junio C Hamano <hidden>
Date: 2022-02-09 18:43:10

Elijah Newren [off-list ref] writes:
quoted
 [[def_per_worktree_ref]]per-worktree ref::
-       Refs that are per-<<def_working_tree,worktree>>, rather than
+       Refs that are per-<<def_worktree,worktree>>, rather than
        global.  This is presently only <<def_HEAD,HEAD>> and any refs
        that start with `refs/bisect/`, but might later include other
        unusual refs.
@@ -669,3 +669,12 @@ The most notable example is `HEAD`.
        The tree of actual checked out files.  The working tree normally
        contains the contents of the <<def_HEAD,HEAD>> commit's tree,
        plus any local changes that you have made but not yet committed.
+
+[[def_work_tree]]worktree::
+       A repository can have zero (i.e. bare repository) or one or
+       more worktrees attached to it. One "worktree" consists of a
+       "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, per-worktree refs and per-worktree
+       configuration file)
We could also add pseudorefs to the list of things maintained
separately in the final parenthetical comment, but otherwise looks
good.
I think what needs updating is the per_worktree_ref section.  Before
we say "later include other unusual refs", not so unusual pseudorefs
can be mentioned there.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help