Merge branch 'jk/config-include'

* jk/config-include:
  git-config: better document default behavior for `--include`
This commit is contained in:
Junio C Hamano 2016-02-22 13:14:48 -08:00
commit 895f20de9e

View file

@ -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