| 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 | include::{build_dir}/mergetools-diff.adoc[] |
| 17 | |
| 18 | `difftool.<tool>.cmd`:: |
| 19 | Specify the command to invoke the specified diff tool. |
| 20 | The specified command is evaluated in shell with the following |
| 21 | variables available: `LOCAL` is set to the name of the temporary |
| 22 | file containing the contents of the diff pre-image and `REMOTE` |
| 23 | is set to the name of the temporary file containing the contents |
| 24 | of the diff post-image. |
| 25 | + |
| 26 | See the `--tool=<tool>` option in linkgit:git-difftool[1] for more details. |
| 27 | |
| 28 | `difftool.<tool>.path`:: |
| 29 | Override the path for the given tool. This is useful in case |
| 30 | your tool is not in the PATH. |
| 31 | |
| 32 | `difftool.trustExitCode`:: |
| 33 | Exit difftool if the invoked diff tool returns a non-zero exit status. |
| 34 | + |
| 35 | See the `--trust-exit-code` option in linkgit:git-difftool[1] for more details. |
| 36 | |
| 37 | `difftool.prompt`:: |
| 38 | Prompt before each invocation of the diff tool. |
| 39 | |
| 40 | `difftool.guiDefault`:: |
| 41 | Set `true` to use the `diff.guitool` by default (equivalent to specifying |
| 42 | the `--gui` argument), or `auto` to select `diff.guitool` or `diff.tool` |
| 43 | depending on the presence of a `DISPLAY` environment variable value. The |
| 44 | default is `false`, where the `--gui` argument must be provided |
| 45 | explicitly for the `diff.guitool` to be used. |