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 /gitglossary.html | |
parent | 034a2ff96f3a3aa981e5ae4e242cefa4bd00323b (diff) | |
download | git-htmldocs-99a21c3fd90112166afacf1fe1ed3e1c5d74cea6.tar.gz |
Autogenerated HTML docs for v2.35.1-273-ge6ebf
Diffstat (limited to 'gitglossary.html')
-rw-r--r-- | gitglossary.html | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/gitglossary.html b/gitglossary.html index d16e1e097..9289afb26 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1293,7 +1293,7 @@ This commit is referred to as a "merge commit", or sometimes just a 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:</p></div>
<div class="openblock">
@@ -1516,7 +1516,7 @@ exclude </dt>
<dd>
<p>
- Refs that are per-<a href="#def_working_tree">worktree</a>, rather than
+ Refs that are per-<a href="#def_worktree">worktree</a>, rather than
global. This is presently only <a href="#def_HEAD">HEAD</a> and any refs
that start with <code>refs/bisect/</code>, but might later include other
unusual refs.
@@ -1897,6 +1897,20 @@ The most notable example is <code>HEAD</code>.</p></div> plus any local changes that you have made but not yet committed.
</p>
</dd>
+<dt class="hdlist1">
+<a id="def_worktree"></a>worktree
+</dt>
+<dd>
+<p>
+ 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).
+</p>
+</dd>
</dl></div>
</div>
</div>
|