Re: [PATCH v2 1/9] docs: add and use include template for config/* includes

From: Matheus Tavares <matheus.bernardino@usp.br>
Date: Jul 30, 2022, 13:29 UTC
Message-ID: <CAHd-oW5mD-H1kvuF9VEVb8KjaSkUSUpBH-WAkpCn6_Ci8o888w@mail.gmail.com>
In-Reply-To: <patch-v2-1.9-ef6fa5450e7-20220729T081959Z-avarab@gmail.com>

On Fri, Jul 29, 2022 at 5:25 AM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 17 quoted lines

>
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index 3125473cc1d..6e5db8ef4c5 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -386,13 +386,16 @@ include::merge-strategies.txt[]
>
>  CONFIGURATION
>  -------------
> -include::config/merge.txt[]
>
>  branch.<name>.mergeOptions::
>         Sets default options for merging into branch <name>. The syntax and
>         supported options are the same as those of 'git merge', but option
>         values containing whitespace characters are currently not supported.
>
> +include::includes/cmd-config-section-rest.txt[]

This will say that "everything above this line is unique to this documentation", but `branch.<name>.mergeOptions` is in git-config(1) with the same wording that it appears here (coming from config/branch.txt).

Nevertheless, I'm not sure if it is worth moving this definition to a separate file, to be included by both git-merge(1) and git-config(1)...

Show 6 quoted lines

> +
> +include::config/merge.txt[]
> +
>  SEE ALSO
>  --------
>  linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],