diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
| commit | a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13 (patch) | |
| tree | 0ff1a62d28a13bc8d8708148b85d3b0ba2632f92 /Documentation/git-difftool.txt | |
| parent | Merge branch 'master' of https://github.com/Softcatala/git-po (diff) | |
| parent | Git 2.22-rc2 (diff) | |
| download | tgif-a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
Git 2.22-rc2
...
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 96c26e6aa8..484c485fd0 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/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. |