diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 23:06:12 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 23:06:12 +0900 |
commit | 06ce83b0f83d238e1676b4adb708f142ab2f9cab (patch) | |
tree | fd8a17fa9e44c0cd9998a5dd175c09acad027425 /gitrepository-layout.html | |
parent | 46fbbcbae6430ff14f0d5ef0e6e9fea90d4fe808 (diff) | |
download | git-htmldocs-06ce83b0f83d238e1676b4adb708f142ab2f9cab.tar.gz |
Autogenerated HTML docs for v2.19.1-1052-gd166e
Diffstat (limited to 'gitrepository-layout.html')
-rw-r--r-- | gitrepository-layout.html | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 9589610ff..8da611a59 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html @@ -890,8 +890,10 @@ refs References are stored in subdirectories of this
directory. The <em>git prune</em> command knows to preserve
objects reachable from refs found in this directory and
- its subdirectories. This directory is ignored if $GIT_COMMON_DIR
- is set and "$GIT_COMMON_DIR/refs" will be used instead.
+ its subdirectories.
+ This directory is ignored (except refs/bisect and
+ refs/worktree) if $GIT_COMMON_DIR is set and
+ "$GIT_COMMON_DIR/refs" will be used instead.
</p>
</dd>
<dt class="hdlist1">
@@ -974,6 +976,16 @@ config </p>
</dd>
<dt class="hdlist1">
+config.worktree
+</dt>
+<dd>
+<p>
+ Working directory specific configuration file for the main
+ working directory in multiple working directory setup (see
+ <a href="git-worktree.html">git-worktree(1)</a>).
+</p>
+</dd>
+<dt class="hdlist1">
branches
</dt>
<dd>
@@ -1005,6 +1017,17 @@ hooks </p>
</dd>
<dt class="hdlist1">
+common
+</dt>
+<dd>
+<p>
+ When multiple working trees are used, most of files in
+ $GIT_DIR are per-worktree with a few known exceptions. All
+ files under <em>common</em> however will be shared between all
+ working trees.
+</p>
+</dd>
+<dt class="hdlist1">
index
</dt>
<dd>
@@ -1202,6 +1225,14 @@ worktrees/<id>/locked explaining why the repository is locked.
</p>
</dd>
+<dt class="hdlist1">
+worktrees/<id>/config.worktree
+</dt>
+<dd>
+<p>
+ Working directory specific configuration file.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1229,7 +1260,7 @@ worktrees/<id>/locked <div id="footer">
<div id="footer-text">
Last updated
- 2018-04-09 17:52:07 PDT
+ 2018-11-13 23:05:48 JST
</div>
</div>
</body>
|