aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-07-27 09:16:53 -0700
committerJunio C Hamano <gitster@pobox.com>2022-07-27 09:16:53 -0700
commit6fa54b8fb5f2658630a27c85b694d92001812cc2 (patch)
tree5f3653dc7779c20e81deb34519a1ce89cab3ffa8 /Documentation/config.txt
parenta88527203f0087114d4429b7f49bb6f79798d15a (diff)
parent07aed5801722635684b5f0f8f3c26903fdd11f8e (diff)
downloadgit-6fa54b8fb5f2658630a27c85b694d92001812cc2.tar.gz
Merge branch 'mb/config-document-include'
Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teaches the command line completion to include them in its offerings. * mb/config-document-include: config.txt: document include, includeIf
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e376d547ce..5b5b976569 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -445,6 +445,8 @@ include::config/i18n.txt[]
include::config/imap.txt[]
+include::config/includeif.txt[]
+
include::config/index.txt[]
include::config/init.txt[]