summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-07-27 16:16:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-07-27 16:16:53 (GMT)
commit6fa54b8fb5f2658630a27c85b694d92001812cc2 (patch)
tree5f3653dc7779c20e81deb34519a1ce89cab3ffa8 /Documentation/config
parenta88527203f0087114d4429b7f49bb6f79798d15a (diff)
parent07aed5801722635684b5f0f8f3c26903fdd11f8e (diff)
downloadgit-6fa54b8fb5f2658630a27c85b694d92001812cc2.zip
git-6fa54b8fb5f2658630a27c85b694d92001812cc2.tar.gz
git-6fa54b8fb5f2658630a27c85b694d92001812cc2.tar.bz2
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')
-rw-r--r--Documentation/config/includeif.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/includeif.txt b/Documentation/config/includeif.txt
new file mode 100644
index 0000000..82fe431
--- /dev/null
+++ b/Documentation/config/includeif.txt
@@ -0,0 +1,6 @@
+include.path::
+includeIf.<condition>.path::
+ Special variables to include other configuration files. See
+ the "CONFIGURATION FILE" section in the main
+ linkgit:git-config[1] documentation,
+ specifically the "Includes" and "Conditional Includes" subsections.