]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/config/difftool.txt
Merge branch 'jk/clone-allow-bare-and-o-together'
[thirdparty/git.git] / Documentation / config / difftool.txt
1 diff.tool::
2 Controls which diff tool is used by linkgit:git-difftool[1].
3 This variable overrides the value configured in `merge.tool`.
4 The list below shows the valid built-in values.
5 Any other value is treated as a custom diff tool and requires
6 that a corresponding difftool.<tool>.cmd variable is defined.
7
8 diff.guitool::
9 Controls which diff tool is used by linkgit:git-difftool[1] when
10 the -g/--gui flag is specified. This variable overrides the value
11 configured in `merge.guitool`. The list below shows the valid
12 built-in values. Any other value is treated as a custom diff tool
13 and requires that a corresponding difftool.<guitool>.cmd variable
14 is defined.
15
16 difftool.<tool>.cmd::
17 Specify the command to invoke the specified diff tool.
18 The specified command is evaluated in shell with the following
19 variables available: 'LOCAL' is set to the name of the temporary
20 file containing the contents of the diff pre-image and 'REMOTE'
21 is set to the name of the temporary file containing the contents
22 of the diff post-image.
23 +
24 See the `--tool=<tool>` option in linkgit:git-difftool[1] for more details.
25
26 difftool.<tool>.path::
27 Override the path for the given tool. This is useful in case
28 your tool is not in the PATH.
29
30 difftool.trustExitCode::
31 Exit difftool if the invoked diff tool returns a non-zero exit status.
32 +
33 See the `--trust-exit-code` option in linkgit:git-difftool[1] for more details.
34
35 difftool.prompt::
36 Prompt before each invocation of the diff tool.