diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-04-29 08:21:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 16:11:59 +0200 |
| commit | 6c22d715e7b4067a6865ff3fbceab991d0042c12 (patch) | |
| tree | 9d8f81d3a69a7b3f7924ff35e91f6af0da7f4b7d /Documentation/git-difftool.txt | |
| parent | difftool: make --gui, --tool and --extcmd mutually exclusive (diff) | |
| download | git-6c22d715e7b4067a6865ff3fbceab991d0042c12.tar.xz git-6c22d715e7b4067a6865ff3fbceab991d0042c12.zip | |
difftool: fallback on merge.guitool
In git-difftool.txt, it says
'git difftool' falls back to 'git mergetool' config variables when the
difftool equivalents have not been defined.
However, when `diff.guitool` is missing, it doesn't fallback to
anything. Make git-difftool fallback to `merge.guitool` when `diff.guitool` is
missing.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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. |