{"thread":{"id":"62771","subject":"[PATCH] difftool docs: restore correct position of tool list","startedAt":"2025-01-08T23:35:26Z","lastAt":"2025-01-09T16:46:36Z","messageCount":2,"participants":["Adam Johnson via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"510209","messageId":"pull.1849.git.1736379323427.gitgitgadget@gmail.com","threadId":"62771","inReplyTo":null,"subject":"[PATCH] difftool docs: restore correct position of tool list","fromName":"Adam Johnson via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-01-08T23:35:23Z","receivedAt":"2025-01-08T23:35:26Z","isPatch":true,"sender":{"key":"me@adamj.eu","avatar":"https://avatars.githubusercontent.com/u/857609?v=4"},"body":"From: Adam Johnson <me@adamj.eu>\n\n2a9dfdf260 (difftool docs: de-duplicate configuration sections, 2022-09-07)\nmoved the difftool documentation, but missed moving this \"include\" line that\nincludes the generated list of diff tools, as referenced in the moved text.\nThis patch restores the correct position of the included list.\n\nSigned-off-by: Adam Johnson <me@adamj.eu>\n---\n    difftool docs: restore correct position of tool list\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1849%2Fadamchainz%2Faj%2Fgit-difftool-docs-fix-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1849/adamchainz/aj/git-difftool-docs-fix-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1849\n\n Documentation/config/diff.txt     | 2 --\n Documentation/config/difftool.txt | 2 ++\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt\nindex fdae13a2122..1135a62a0ad 100644\n--- a/Documentation/config/diff.txt\n+++ b/Documentation/config/diff.txt\n@@ -218,8 +218,6 @@ endif::git-diff[]\n \tSet this option to `true` to make the diff driver cache the text\n \tconversion outputs.  See linkgit:gitattributes[5] for details.\n \n-include::{build_dir}/mergetools-diff.txt[]\n-\n `diff.indentHeuristic`::\n \tSet this option to `false` to disable the default heuristics\n \tthat shift diff hunk boundaries to make patches easier to read.\ndiff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt\nindex 447c40d85a2..6cd47331a91 100644\n--- a/Documentation/config/difftool.txt\n+++ b/Documentation/config/difftool.txt\n@@ -13,6 +13,8 @@ diff.guitool::\n \tand requires that a corresponding difftool.<guitool>.cmd variable\n \tis defined.\n \n+include::{build_dir}/mergetools-diff.txt[]\n+\n difftool.<tool>.cmd::\n \tSpecify the command to invoke the specified diff tool.\n \tThe specified command is evaluated in shell with the following\n\nbase-commit: a60673e9252b08d4eca90543b3729f4798b9aafd\n-- \ngitgitgadget\n"},{"id":"510263","messageId":"xmqq1pxcj5p2.fsf@gitster.g","threadId":"62771","inReplyTo":"pull.1849.git.1736379323427.gitgitgadget@gmail.com","subject":"Re: [PATCH] difftool docs: restore correct position of tool list","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-01-09T16:46:33Z","receivedAt":"2025-01-09T16:46:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Adam Johnson via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Adam Johnson <me@adamj.eu>\n>\n> 2a9dfdf260 (difftool docs: de-duplicate configuration sections, 2022-09-07)\n> moved the difftool documentation, but missed moving this \"include\" line that\n> includes the generated list of diff tools, as referenced in the moved text.\n\nThanks for a very clearly written problem description.\n\n> diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt\n> index fdae13a2122..1135a62a0ad 100644\n> --- a/Documentation/config/diff.txt\n> +++ b/Documentation/config/diff.txt\n> @@ -218,8 +218,6 @@ endif::git-diff[]\n>  \tSet this option to `true` to make the diff driver cache the text\n>  \tconversion outputs.  See linkgit:gitattributes[5] for details.\n>  \n> -include::{build_dir}/mergetools-diff.txt[]\n> -\n\nAbove this include, there was an entry for diff.guitool, and this\ngenerated file was to enumerate possible values for the\nconfiguration.\n\n>  `diff.indentHeuristic`::\n>  \tSet this option to `false` to disable the default heuristics\n>  \tthat shift diff hunk boundaries to make patches easier to read.\n> diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt\n> index 447c40d85a2..6cd47331a91 100644\n> --- a/Documentation/config/difftool.txt\n> +++ b/Documentation/config/difftool.txt\n> @@ -13,6 +13,8 @@ diff.guitool::\n>  \tand requires that a corresponding difftool.<guitool>.cmd variable\n>  \tis defined.\n>  \n> +include::{build_dir}/mergetools-diff.txt[]\n> +\n\nAnd the list now sits at the right place.\n\nWill queue.  Thanks.\n\n>  difftool.<tool>.cmd::\n>  \tSpecify the command to invoke the specified diff tool.\n>  \tThe specified command is evaluated in shell with the following\n>\n> base-commit: a60673e9252b08d4eca90543b3729f4798b9aafd\n"}]}