Merge branch 'jk/config-include'

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

diff --cc Documentation/git-config.txt
index 2608ca74ac82f7e18531dc0d49a81c84e3155a5c,eca302ef90bb7d0960c6d2d880e58e2c6d82e854..242fa5d1bb2b7eff9645e140613640d94d28852f
--- 1/Documentation/git-config.txt
--- 2/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@@ -217,9 -178,12 +217,11 @@@ See also <<FILES>>
        Opens an editor to modify the specified config file; either
        '--system', '--global', or repository (default).
  
 ---includes::
 ---no-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