On 13 Feb 2016, at 18:17, Jeff King <peff@xxxxxxxx> wrote: > On Sat, Feb 13, 2016 at 03:24:14PM +0100, larsxschneider@xxxxxxxxx wrote: > >> From: Lars Schneider <larsxschneider@xxxxxxxxx> >> >> Helped-by: Jeff King <peff@xxxxxxxx> >> Signed-off-by: Lars Schneider <larsxschneider@xxxxxxxxx> >> --- >> 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. :) Oh. Believe it or not but the similarity is coincidental. I referenced you ("Helped-by") because you explained the expected "includes" behavior to me in your v2 review of my series. If I would have found your patch, I would have said so. I am happy to use your wording. How should I proceed? Should I just drop my "git-config.txt" patch from my series or should I integrate your patch into my series? If the latter, then does the patch require a "Signed-off-by:" by me? Thanks, Lars -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html