aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-05 15:51:36 -0700
committerJunio C Hamano <gitster@pobox.com>2022-08-05 15:51:36 -0700
commitd16978517c20911cbef6f98b78c6ec84ae1be57d (patch)
tree41a6fe423dcac26f675c46e7caf53007ec0e9b54 /Documentation/config
parenta75163119c0f99cf3abff495c0fa35e55cd4cfa1 (diff)
parent07aed5801722635684b5f0f8f3c26903fdd11f8e (diff)
downloadgit-d16978517c20911cbef6f98b78c6ec84ae1be57d.tar.gz
Merge branch 'mb/config-document-include' into maint
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. source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com> * 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 0000000000..82fe431c34
--- /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.