aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/gitrepository-layout.txt
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-11-14 17:02:47 +0100
committerJunio C Hamano <gitster@pobox.com>2018-11-16 14:10:31 +0900
commit356aea6f7921d83f2794124c84ad366b418ec804 (patch)
tree697e98c286d1126c268e9a24bb13eb6b70bdd6c8 /Documentation/gitrepository-layout.txt
parentd166e6afe5f257217836ef24a73764eba390c58d (diff)
downloadgit-356aea6f7921d83f2794124c84ad366b418ec804.tar.gz
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/gitrepository-layout.txt')
-rw-r--r--Documentation/gitrepository-layout.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index d501af9d77..366dee238c 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -290,6 +290,8 @@ worktrees/<id>/locked::
worktrees/<id>/config.worktree::
Working directory specific configuration file.
+include::technical/repository-version.txt[]
+
SEE ALSO
--------
linkgit:git-init[1],