diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:14:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:14:48 -0800 |
| commit | 895f20de9e3ecd68c4b96cf6802a7424e9ace533 (patch) | |
| tree | db529d978754d46f2a8e172bb00a69f537ae96d3 | |
| parent | d7145ef2758194dd7a6aad6aee514f675fb73a0d (diff) | |
| parent | 753a2cda11c4bfb51184acd474e9bdfa051f9895 (diff) | |
| download | git-895f20de9e3ecd68c4b96cf6802a7424e9ace533.tar.gz | |
Merge branch 'jk/config-include'
* jk/config-include:
git-config: better document default behavior for `--include`
| -rw-r--r-- | Documentation/git-config.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 2608ca74ac..242fa5d1bb 100644 --- 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 |