diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:18 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:18 +0900 |
| commit | 8c758f9a67a265ae51beddfd9895d48a42c2af13 (patch) | |
| tree | 555c2d42a1ef3f8d69c64a77fbdb0690d529ff3b /Documentation/config.txt | |
| parent | c657aa0525ed04fbec8901169b8a1fd5bcb877b4 (diff) | |
| parent | 58b284a2e9123588eedc8c5ee17e8b069d9454f8 (diff) | |
| download | git-8c758f9a67a265ae51beddfd9895d48a42c2af13.tar.gz | |
Merge branch 'nd/per-worktree-config'
A fourth class of configuration files (in addition to the
traditional "system wide", "per user in the $HOME directory" and
"per repository in the $GIT_DIR/config") has been introduced so
that different worktrees that share the same repository (hence the
same $GIT_DIR/config file) can use different customization.
* nd/per-worktree-config:
worktree: add per-worktree config files
t1300: extract and use test_cmp_config()
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 75b8f6964d..3e735f1a9a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2,8 +2,9 @@ CONFIGURATION FILE ------------------ The Git configuration file contains a number of variables that affect -the Git commands' behavior. The `.git/config` file in each repository -is used to store the configuration for that repository, and +the Git commands' behavior. The files `.git/config` and optionally +`config.worktree` (see `extensions.worktreeConfig` below) in each +repository are used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration. @@ -291,6 +292,13 @@ include::config/advice.txt[] include::config/core.txt[] +extensions.worktreeConfig:: + If set, by default "git config" reads from both "config" and + "config.worktree" file from GIT_DIR in that order. In + multiple working directory mode, "config" file is shared while + "config.worktree" is per-working directory (i.e., it's in + GIT_COMMON_DIR/worktrees/<id>/config.worktree) + include::config/add.txt[] include::config/alias.txt[] |