summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-05-11 05:11:06 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-12 10:06:58 +0900
commit994cd6c7ca2da9bf09582ba08cbad583cba76968 (patch)
tree5bb0f1454472064405f6b95c4447b7e233971ae6
parentdocs/config: clarify include/includeIf relationship (diff)
downloadtgif-994cd6c7ca2da9bf09582ba08cbad583cba76968.tar.xz
docs/config: give a relative includeIf example
The changes in the previous commit hopefully clarify that the evaluation of an include "path" variable is the same no matter if it's in a conditional section or not. But since this question came up on the list, let's add an example that makes it obvious. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7e7a358aea..cc6d79e537 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -187,6 +187,12 @@ Example
[includeIf "gitdir:~/to/group/"]
path = /path/to/foo.inc
+ ; relative paths are always relative to the including
+ ; file (if the condition is true); their location is not
+ ; affected by the condition
+ [includeIf "gitdir:/path/to/group/"]
+ path = foo.inc
+
Values
~~~~~~