From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Sebastian Schuberth" <sschuberth@gmail.com>,
"Raphael Stolt" <raphael.stolt@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH 1/4] docs/config: clarify include/includeIf relationship
Date: Thu, 11 May 2017 17:47:28 +0100 [thread overview]
Message-ID: <0013fb73-12f2-a365-963e-ed517ea53dc7@ramsayjones.plus.com> (raw)
In-Reply-To: <20170511091047.2dw52pnriulhjky3@sigill.intra.peff.net>
On 11/05/17 10:10, Jeff King wrote:
> The "includeIf" directives behave exactly like include ones,
> except they only kick in when the conditional is true. That
> was mentioned in the "conditional" section, but let's make
> it more clear for the whole "includes" section, since people
> don't necessarily read the documentation top to bottom.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Documentation/config.txt | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 475e874d5..d5a453ed3 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -79,14 +79,20 @@ escape sequences) are invalid.
> Includes
> ~~~~~~~~
>
> +The `include` and `includeIf` sections allow you include config
s/you include/you to include/
ATB,
Ramsay Jones
next prev parent reply other threads:[~2017-05-11 16:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-10 17:00 Possible bug in includeIf / conditional includes raphael.stolt
2017-05-10 18:58 ` Sebastian Schuberth
2017-05-10 19:48 ` Ævar Arnfjörð Bjarmason
2017-05-10 21:21 ` Raphael Stolt
2017-05-10 21:37 ` Raphael Stolt
2017-05-11 6:26 ` Jeff King
2017-05-11 6:29 ` Jeff King
2017-05-11 7:19 ` Ævar Arnfjörð Bjarmason
2017-05-11 7:42 ` Jeff King
2017-05-11 7:49 ` Ævar Arnfjörð Bjarmason
2017-05-11 7:54 ` Jeff King
2017-05-11 9:09 ` [PATCH 0/4] doc improvements for config includes Jeff King
2017-05-11 9:10 ` [PATCH 1/4] docs/config: clarify include/includeIf relationship Jeff King
2017-05-11 16:47 ` Ramsay Jones [this message]
2017-05-12 9:28 ` Jeff King
2017-05-11 9:11 ` [PATCH 2/4] docs/config: give a relative includeIf example Jeff King
2017-05-11 9:13 ` [PATCH 3/4] docs/config: avoid the term "expand" for includes Jeff King
2017-05-11 9:14 ` [PATCH 4/4] docs/config: consistify include.path examples Jeff King
2017-05-11 9:41 ` Junio C Hamano
2017-05-11 9:29 ` [PATCH 0/4] doc improvements for config includes Ævar Arnfjörð Bjarmason
2017-05-11 7:54 ` Possible bug in includeIf / conditional includes Junio C Hamano
2017-05-11 7:56 ` Jeff King
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=0013fb73-12f2-a365-963e-ed517ea53dc7@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=raphael.stolt@gmail.com \
--cc=sschuberth@gmail.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).