{"thread":{"id":"53315","subject":"[PATCH] config doc: fix reference to config.worktree info","startedAt":"2020-04-25T01:05:49Z","lastAt":"2020-04-25T01:05:49Z","messageCount":1,"participants":["Matheus Tavares"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"396211","messageId":"569b5808d64a95369daa4b882e14d9f3ab87871e.1587776525.git.matheus.bernardino@usp.br","threadId":"53315","inReplyTo":null,"subject":"[PATCH] config doc: fix reference to config.worktree info","fromName":"Matheus Tavares","fromEmail":"matheus.bernardino@usp.br","sentAt":"2020-04-25T01:05:38Z","receivedAt":"2020-04-25T01:05:49Z","isPatch":true,"sender":{"key":"matheus.tavb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701583?v=4"},"body":"356aea6 (\"doc: move extensions.worktreeConfig to the right place\",\n2018-11-14) moved the explanation of extension.worktreeConfig from\nconfig.txt to technical/repository-version.txt. However, the former\nstill contains a reference to the removed paragraph. We could fix it\nreferencing the gitrepository-layout man page, which contains the moved\nexplanation. But the git-worktree man page has additional information\nand recommendations for the worktree config file, so let's reference it\ninstead.\n\nSigned-off-by: Matheus Tavares <matheus.bernardino@usp.br>\n---\n\nNote: git diff --word-diff should only show the following change:\n\n...\n`config.worktree` (see [-`extensions.worktreeConfig` below)-]{+the \"CONFIGURATION FILE\" section of+}\n{+linkgit:git-worktree[1])+} in each repository are used to store the\n...\n\n Documentation/config.txt | 11 ++++++-----\n 1 file changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 74009d5402..ef0768b91a 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -3,11 +3,12 @@ CONFIGURATION FILE\n \n The Git configuration file contains a number of variables that affect\n the Git commands' behavior. The files `.git/config` and optionally\n-`config.worktree` (see `extensions.worktreeConfig` below) in each\n-repository are used to store the configuration for that repository, and\n-`$HOME/.gitconfig` is used to store a per-user configuration as\n-fallback values for the `.git/config` file. The file `/etc/gitconfig`\n-can be used to store a system-wide default configuration.\n+`config.worktree` (see the \"CONFIGURATION FILE\" section of\n+linkgit:git-worktree[1]) in each repository are used to store the\n+configuration for that repository, and `$HOME/.gitconfig` is used to\n+store a per-user configuration as fallback values for the `.git/config`\n+file. The file `/etc/gitconfig` can be used to store a system-wide\n+default configuration.\n \n The configuration variables are used by both the Git plumbing\n and the porcelains. The variables are divided into sections, wherein\n-- \n2.26.1\n\n"}]}