Re: [PATCH v3 1/3] git-config.txt: describe '--includes' default behavior

From: Jeff King <peff@peff.net>
Date: Feb 13, 2016, 17:17 UTC
Message-ID: <20160213171704.GF30144@sigill.intra.peff.net>
In-Reply-To: <1455373456-64691-2-git-send-email-larsxschneider@gmail.com>

On Sat, Feb 13, 2016 at 03:24:14PM +0100, larsxschneider@gmail.com wrote:

Show 20 quoted lines

> From: Lars Schneider <larsxschneider@gmail.com>
> 
> Helped-by: Jeff King <peff@peff.net>
> Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
> ---
>  Documentation/git-config.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
> index 2608ca7..59b1c95 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 reading a specific config file
> +	(e.g. via `--file` or via `--local` etc.), and to on when
> +	generically reading all config.

Hmph. I wondered why you were confused about this the other day, when I checked my Documentation/git-config.txt and found that yes, we do indeed document this behavior. I did not realize then that my patch from:

  http://article.gmane.org/gmane.comp.version-control.git/262641

was never picked up (but of course I've been carrying it in my tree for a year). I guess maybe you found it, given the similarity of the wording. I mildly prefer the wording and formatting of my original, but I am OK either way. :)

-Peff