diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 18:01:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 18:01:19 +0900 |
| commit | 56d696ee5be4d6ce871726df6e396c76eedcccf0 (patch) | |
| tree | 5fdbf981967be28ae958f476b0b6d9b4343fd146 /git-difftool.txt | |
| parent | 792b6092433e1d94ae2e4b9e83a333bf2d0425a2 (diff) | |
| download | git-htmldocs-56d696ee5be4d6ce871726df6e396c76eedcccf0.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc1
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index 96c26e6aa..484c485fd 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -90,7 +90,9 @@ instead. `--no-symlinks` is the default on Windows. When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` - option can be used to override this setting. + option can be used to override this setting. If `diff.guitool` + is not set, we will fallback in the order of `merge.guitool`, + `diff.tool`, `merge.tool` until a tool is found. --[no-]trust-exit-code:: 'git-difftool' invokes a diff tool individually on each file. |