diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-18 14:08:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-18 14:08:41 -0800 |
| commit | 99a21c3fd90112166afacf1fe1ed3e1c5d74cea6 (patch) | |
| tree | e7775783ce7319d96df3b6768de5470c7b4b2503 /glossary-content.txt | |
| parent | 034a2ff96f3a3aa981e5ae4e242cefa4bd00323b (diff) | |
| download | git-htmldocs-99a21c3fd90112166afacf1fe1ed3e1c5d74cea6.tar.gz | |
Autogenerated HTML docs for v2.35.1-273-ge6ebf
Diffstat (limited to 'glossary-content.txt')
| -rw-r--r-- | glossary-content.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/glossary-content.txt b/glossary-content.txt index c07797133..aa2f41f5e 100644 --- a/glossary-content.txt +++ b/glossary-content.txt @@ -312,7 +312,7 @@ Pathspecs are used on the command line of "git ls-files", "git ls-tree", "git add", "git grep", "git diff", "git checkout", and many other commands to limit the scope of operations to some subset of the tree or -worktree. See the documentation of each command for whether +working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows: + @@ -446,7 +446,7 @@ exclude;; interface than the <<def_plumbing,plumbing>>. [[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_worktree]]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 and pseudorefs like MERGE_HEAD, + per-worktree refs and per-worktree configuration file). |