Thread (35 messages) flat view 35 messages, 3 authors, 2016-06-15

Re: [PATCH 5/5] git-worktree.txt: mention about the config file split

From: Eric Sunshine <hidden>
Date: 2016-06-15 23:07:23

On Wed, Dec 2, 2015 at 2:13 PM, Nguyễn Thái Ngọc Duy [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
@@ -147,6 +147,19 @@ to `/path/main/.git/worktrees/test-next` then a file named
 `test-next` entry from being pruned.  See
 linkgit:gitrepository-layout[5] for details.

+Similar to the file system split in ".git", the repository config file
+is also split. Certain variables, for example core.worktree, are
+per-worktree while the majority of variables are still shared (see
+linkgit:git-config[1] for details). Shared variables and per-working
+tree ones that belong to the main working tree are in .git/config.
+Per-working tree variables for working tree X are in
+$GIT_COMMON_DIR/worktrees/X/config.worktree. Even though per-working
Existing examples in the DETAILS section call this "test-next" rather
than "X", so perhaps s/X/test-next/g ?
+tree variables for the main working tree are in the default config
+place, they are invisible from all linked working trees.  You can make
+more config variables per-working tree by adding them in
+.git/info/config.worktree (see linkgit:gitrepository-layout[5] for
+details).
+
 LIST OUTPUT FORMAT
 ------------------
 The worktree list command has two output formats.  The default format shows the
--
2.2.0.513.g477eb31
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help