summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-01-19 14:58:47 -0500
committerJunio C Hamano <gitster@pobox.com>2016-02-13 12:51:31 -0800
commit753a2cda11c4bfb51184acd474e9bdfa051f9895 (patch)
tree65c221b1c60d8dbb1fb55fe6f0f610c8d5508c72
parent9b25a0b52e09400719366f0a33d0d0da98bbf7b0 (diff)
downloadgit-jk/config-include.tar.gz
git-config: better document default behavior for `--include`jk/config-include
As described in the commit message of 9b25a0b (config: add include directive, 2012-02-06), the `--include` option is only on by default in some cases. But our documentation described it as just "defaults to on", which doesn't tell the whole story. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-config.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index aa8303b1ad..eca302ef90 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -181,7 +181,9 @@ See also <<FILES>>.
--includes::
--no-includes::
Respect `include.*` directives in config files when looking up
- values. Defaults to on.
+ values. Defaults to `off` when a specific file is given (e.g.,
+ using `--file`, `--global`, etc) and `on` when searching all
+ config files.
[[FILES]]
FILES