difftool docs: restore correct position of tool list #1849
Conversation
2a9dfdf (difftool docs: de-duplicate configuration sections, 2022-09-07) moved the difftool documentation, but missed moving this "include" line that includes the generated list of diff tools, as referenced in the moved text. This patch restores the correct position of the included list. Signed-off-by: Adam Johnson <[email protected]>
|
/preview |
|
Preview email sent as [email protected] |
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): "Adam Johnson via GitGitGadget" <[email protected]> writes:
> From: Adam Johnson <[email protected]>
>
> 2a9dfdf260 (difftool docs: de-duplicate configuration sections, 2022-09-07)
> moved the difftool documentation, but missed moving this "include" line that
> includes the generated list of diff tools, as referenced in the moved text.
Thanks for a very clearly written problem description.
> diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
> index fdae13a2122..1135a62a0ad 100644
> --- a/Documentation/config/diff.txt
> +++ b/Documentation/config/diff.txt
> @@ -218,8 +218,6 @@ endif::git-diff[]
> Set this option to `true` to make the diff driver cache the text
> conversion outputs. See linkgit:gitattributes[5] for details.
>
> -include::{build_dir}/mergetools-diff.txt[]
> -
Above this include, there was an entry for diff.guitool, and this
generated file was to enumerate possible values for the
configuration.
> `diff.indentHeuristic`::
> Set this option to `false` to disable the default heuristics
> that shift diff hunk boundaries to make patches easier to read.
> diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt
> index 447c40d85a2..6cd47331a91 100644
> --- a/Documentation/config/difftool.txt
> +++ b/Documentation/config/difftool.txt
> @@ -13,6 +13,8 @@ diff.guitool::
> and requires that a corresponding difftool.<guitool>.cmd variable
> is defined.
>
> +include::{build_dir}/mergetools-diff.txt[]
> +
And the list now sits at the right place.
Will queue. Thanks.
> difftool.<tool>.cmd::
> Specify the command to invoke the specified diff tool.
> The specified command is evaluated in shell with the following
>
> base-commit: a60673e9252b08d4eca90543b3729f4798b9aafd |
|
This patch series was integrated into seen via git@cd7b424. |
|
This branch is now known as |
|
This patch series was integrated into seen via git@c445e34. |
|
This patch series was integrated into seen via git@a94f9b5. |
|
This patch series was integrated into next via git@b8902a5. |
|
This patch series was integrated into seen via git@f28a386. |
|
There was a status update in the "New Topics" section about the branch Docfix. Will cook in 'next'. source: <[email protected]> |
|
This patch series was integrated into seen via git@0dbe5f4. |
|
This patch series was integrated into seen via git@dd72727. |
|
There was a status update in the "Cooking" section about the branch Docfix. Will merge to 'master'. source: <[email protected]> |
|
This patch series was integrated into seen via git@767d738. |
|
This patch series was integrated into seen via git@4728ff0. |
|
This patch series was integrated into seen via git@ef87f15. |
|
This patch series was integrated into seen via git@c782149. |
|
There was a status update in the "Cooking" section about the branch Docfix. Will merge to 'master'. source: <[email protected]> |
CC: Ævar Arnfjörð Bjarmason [email protected], Matheus Tavares [email protected]