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

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Dec 6, 2015, 08:02 UTC
Message-ID: <CAPig+cT3NrF+0uDi4krd9WoqqJvZUqxCfhVxekoKWaPZ7C_dKw@mail.gmail.com>
In-Reply-To: <1449083626-20075-6-git-send-email-pclouds@gmail.com>

On Wed, Dec 2, 2015 at 2:13 PM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:

Show 14 quoted lines

> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> 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 ?

Show 11 quoted lines

> +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