From: Lars Schneider <larsxschneider@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, sschuberth@gmail.com,
ramsay@ramsayjones.plus.com, sunshine@sunshineco.com,
hvoigt@hvoigt.net, sbeller@google.com
Subject: Re: [PATCH v3 1/3] git-config.txt: describe '--includes' default behavior
Date: Sun, 14 Feb 2016 13:17:43 +0100 [thread overview]
Message-ID: <0FE601E5-B926-4E23-9FA5-2F898C12BBB9@gmail.com> (raw)
In-Reply-To: <20160213171704.GF30144@sigill.intra.peff.net>
On 13 Feb 2016, at 18:17, Jeff King <peff@peff.net> wrote:
> On Sat, Feb 13, 2016 at 03:24:14PM +0100, larsxschneider@gmail.com wrote:
>
>> 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. :)
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
next prev parent reply other threads:[~2016-02-14 12:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-13 14:24 [PATCH v3 0/3] config: add '--sources' option to print the source of a config value larsxschneider
2016-02-13 14:24 ` [PATCH v3 1/3] git-config.txt: describe '--includes' default behavior larsxschneider
2016-02-13 17:17 ` Jeff King
2016-02-13 21:00 ` Junio C Hamano
2016-02-14 0:34 ` Jeff King
2016-02-14 12:17 ` Lars Schneider [this message]
2016-02-14 16:05 ` Jeff King
2016-02-13 14:24 ` [PATCH v3 2/3] config: add 'type' to config_source struct that identifies config type larsxschneider
2016-02-13 17:24 ` Jeff King
2016-02-13 21:04 ` Junio C Hamano
2016-02-14 12:26 ` Lars Schneider
2016-02-14 12:24 ` Lars Schneider
2016-02-14 16:07 ` Jeff King
2016-02-13 14:24 ` [PATCH v3 3/3] config: add '--show-origin' option to print the origin of a config value larsxschneider
2016-02-13 17:44 ` Jeff King
2016-02-13 18:04 ` Jeff King
2016-02-13 18:15 ` Jeff King
2016-02-15 9:41 ` Lars Schneider
2016-02-14 12:48 ` Lars Schneider
2016-02-14 16:18 ` Jeff King
2016-02-15 7:53 ` Johannes Schindelin
2016-02-13 14:43 ` [PATCH v3 0/3] config: add '--sources' option to print the source " Mike Rappazzo
2016-02-13 17:26 ` Sebastian Schuberth
2016-02-13 18:19 ` Jeff King
2016-02-13 21:05 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0FE601E5-B926-4E23-9FA5-2F898C12BBB9@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sbeller@google.com \
--cc=sschuberth@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).