From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Feb 2016 21:14:48 +0000 (-0800)
Subject: Merge branch 'jk/config-include'
X-Git-Tag: v2.8.0-rc0~40
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/895f20de9e3ecd68c4b96cf6802a7424e9ace533?hp=d7145ef2758194dd7a6aad6aee514f675fb73a0d

Merge branch 'jk/config-include'

* jk/config-include:
git-config: better document default behavior for `--include`
---

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 2608ca74ac..242fa5d1bb 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -219,7 +219,9 @@ See also <<FILES>>.
 
 --[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