diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:56 -0700 |
| commit | 3e68f552f3c3aa5b16570a87d3ffd74b2d866ba8 (patch) | |
| tree | 81ee44d9b5ef854b7a1694f000163454d0e3569e /Documentation | |
| parent | Merge branch 'eb/gitweb-more-trailers' (diff) | |
| parent | config doc: fix reference to config.worktree info (diff) | |
| download | tgif-3e68f552f3c3aa5b16570a87d3ffd74b2d866ba8.tar.xz | |
Merge branch 'mt/doc-worktree-ref'
Docfix.
* mt/doc-worktree-ref:
config doc: fix reference to config.worktree info
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 74009d5402..ef0768b91a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -3,11 +3,12 @@ CONFIGURATION FILE The Git configuration file contains a number of variables that affect 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. +`config.worktree` (see the "CONFIGURATION FILE" section of +linkgit:git-worktree[1]) 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. The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein |