Merge branch 'jk/config-include'

* jk/config-include: git-config: better document default behavior for `--include`
2016-02-22 13:14:48 -08:00 · 2016-02-22 13:14:48 -08:00 · 895f20de9e
parent d7145ef275 753a2cda11
commit 895f20de9e
1 changed files with 3 additions and 1 deletions
--- 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