Merge branch 'jk/config-include'

* jk/config-include: git-config: better document default behavior for `--include`
git-mirror · Feb 22, 2016 · 895f20d · 895f20d
2 parents d7145ef + 753a2cd
commit 895f20d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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