Skip to content

Commit bdccbf7

Browse files
matheustavaresgitster
authored andcommitted
config doc: fix reference to config.worktree info
356aea6 ("doc: move extensions.worktreeConfig to the right place", 2018-11-14) moved the explanation of extension.worktreeConfig from config.txt to technical/repository-version.txt. However, the former still contains a reference to the removed paragraph. We could fix it referencing the gitrepository-layout man page, which contains the moved explanation. But the git-worktree man page has additional information and recommendations for the worktree config file, so let's reference it instead. Signed-off-by: Matheus Tavares <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent af6b65d commit bdccbf7

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Documentation/config.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ CONFIGURATION FILE
33

44
The Git configuration file contains a number of variables that affect
55
the Git commands' behavior. The files `.git/config` and optionally
6-
`config.worktree` (see `extensions.worktreeConfig` below) in each
7-
repository are used to store the configuration for that repository, and
8-
`$HOME/.gitconfig` is used to store a per-user configuration as
9-
fallback values for the `.git/config` file. The file `/etc/gitconfig`
10-
can be used to store a system-wide default configuration.
6+
`config.worktree` (see the "CONFIGURATION FILE" section of
7+
linkgit:git-worktree[1]) in each repository are used to store the
8+
configuration for that repository, and `$HOME/.gitconfig` is used to
9+
store a per-user configuration as fallback values for the `.git/config`
10+
file. The file `/etc/gitconfig` can be used to store a system-wide
11+
default configuration.
1112

1213
The configuration variables are used by both the Git plumbing
1314
and the porcelains. The variables are divided into sections, wherein

0 commit comments

Comments
 (0)