summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-11-14 17:02:47 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-16 14:10:31 +0900
commit356aea6f7921d83f2794124c84ad366b418ec804 (patch)
tree697e98c286d1126c268e9a24bb13eb6b70bdd6c8 /Documentation/config.txt
parentTenth batch for 2.20 (diff)
downloadtgif-356aea6f7921d83f2794124c84ad366b418ec804.tar.xz
doc: move extensions.worktreeConfig to the right place
All config extensions are described in technical/repository-version.txt. I made a mistake of adding it in config.txt instead. This patch moves it back to where it belongs. Since repository-version.txt is not part of officially generated documents (it's not even part of DOC_HTML target), it's only visible to developers who read plain .txt files. Let's include it in gitrepository-layout.5 for more visibility. Some minor asciidoc fixes are required in repository-version.txt to make this happen. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e735f1a9a..d87846faa6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -292,13 +292,6 @@ 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[]