Sync with 2.7.2

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 2608ca74ac82f7e18531dc0d49a81c84e3155a5c..242fa5d1bb2b7eff9645e140613640d94d28852f 100644 (file)
--- 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