From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Feb 2016 21:14:48 +0000 (-0800)
Subject: Merge branch 'jk/config-include'
X-Git-Tag: v2.8.0-rc0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=895f20de9e3ecd68c4b96cf6802a7424e9ace533;p=thirdparty%2Fgit.git

Merge branch 'jk/config-include'

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

895f20de9e3ecd68c4b96cf6802a7424e9ace533
diff --cc Documentation/git-config.txt
index 2608ca74ac,eca302ef90..242fa5d1bb
--- a/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