diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-02-25 16:21:27 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 16:21:27 -0800 |
commit | 5f907e9e08462d0b15c8983fc31451755eb9cebe (patch) | |
tree | 47c3163dd546269ddc4740cb8e6ed0e5a89e0195 /git-worktree.html | |
parent | c44a3c5407578ca733b6e1aa66cf8a94e5b4d2e3 (diff) | |
download | git-htmldocs-5f907e9e08462d0b15c8983fc31451755eb9cebe.tar.gz |
Autogenerated HTML docs for v2.35.1-354-g715d08
Diffstat (limited to 'git-worktree.html')
-rw-r--r-- | git-worktree.html | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/git-worktree.html b/git-worktree.html index e4469fcb4..96de76e17 100644 --- a/git-worktree.html +++ b/git-worktree.html @@ -1136,8 +1136,8 @@ which will handle refs correctly.</p></div> <div class="sectionbody">
<div class="paragraph"><p>By default, the repository <code>config</code> file is shared across all working
trees. If the config variables <code>core.bare</code> or <code>core.worktree</code> are
-already present in the config file, they will be applied to the main
-working trees only.</p></div>
+present in the common config file and <code>extensions.worktreeConfig</code> is
+disabled, then they will be applied to the main working tree only.</p></div>
<div class="paragraph"><p>In order to have configuration specific to working trees, you can turn
on the <code>worktreeConfig</code> extension, e.g.:</p></div>
<div class="listingblock">
@@ -1156,7 +1156,12 @@ do not want to share to all working trees:</p></div> <div class="ulist"><ul>
<li>
<p>
-<code>core.worktree</code> and <code>core.bare</code> should never be shared
+<code>core.worktree</code> should never be shared.
+</p>
+</li>
+<li>
+<p>
+<code>core.bare</code> should not be shared if the value is <code>core.bare=true</code>.
</p>
</li>
<li>
@@ -1166,6 +1171,8 @@ do not want to share to all working trees:</p></div> </p>
</li>
</ul></div>
+<div class="paragraph"><p>See the documentation of <code>extensions.worktreeConfig</code> in
+<a href="git-config.html">git-config(1)</a> for more details.</p></div>
</div>
</div>
<div class="sect1">
@@ -1360,7 +1367,7 @@ checkouts of a superproject.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-15 12:58:55 PST
+ 2022-02-25 16:19:34 PST
</div>
</div>
</body>
|