mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
2a9dfdf260
Include the "config/difftool.txt" file in "git-difftool.txt", and move the relevant part of git-difftool(1) configuration from "config/diff.txt" to config/difftool.txt". Doing this is slightly odd, as we usually discuss configuration in alphabetical order, but by doing it we're able to include the full set of configuration used by git-difftool(1) (and only that configuration) in its own documentation. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
37 lines
1.4 KiB
Plaintext
37 lines
1.4 KiB
Plaintext
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.
|
|
|
|
difftool.<tool>.cmd::
|
|
Specify the command to invoke the specified diff tool.
|
|
The specified command is evaluated in shell with the following
|
|
variables available: 'LOCAL' is set to the name of the temporary
|
|
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.
|
|
|
|
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.
|
|
|
|
difftool.prompt::
|
|
Prompt before each invocation of the diff tool.
|