On Fri, Jul 29, 2022 at 5:26 AM Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > > diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt > index 67625944804..a3f82112102 100644 > --- a/Documentation/config/difftool.txt > +++ b/Documentation/config/difftool.txt > @@ -1,6 +1,17 @@ > -difftool.<tool>.path:: > - Override the path for the given tool. This is useful in case > - your tool is not in the PATH. > +diff.tool:: > + Controls which diff tool is used by linkgit:git-difftool[1]. > + This variable overrides the value configured in `merge.tool`. > + The list below shows the valid built-in values. > + Any other value is treated as a custom diff tool and requires > + that a corresponding difftool.<tool>.cmd variable is defined. > + > +diff.guitool:: > + Controls which diff tool is used by linkgit:git-difftool[1] when > + the -g/--gui flag is specified. This variable overrides the value > + configured in `merge.guitool`. The list below shows the valid > + built-in values. Any other value is treated as a custom diff tool > + and requires that a corresponding difftool.<guitool>.cmd variable > + is defined. At first glance I thought it was a bit weird to have this diff.* definitions moved to difftool, but it makes sense since these are indeed related to difftool. > difftool.<tool>.cmd:: > Specify the command to invoke the specified diff tool. > @@ -9,6 +20,17 @@ difftool.<tool>.cmd:: > file containing the contents of the diff pre-image and 'REMOTE' > is set to the name of the temporary file containing the contents > of the diff post-image. > ++ > +See the `--tool=<tool>` option in linkgit:git-difftool[1] for more details. > + OK, this comes from the removed part of Documentation/git-difftool.txt. > +difftool.<tool>.path:: > + Override the path for the given tool. This is useful in case > + your tool is not in the PATH. > + > +difftool.trustExitCode:: > + Exit difftool if the invoked diff tool returns a non-zero exit status. > ++ > +See the `--trust-exit-code` option in linkgit:git-difftool[1] for more details. And so does this.
