diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-15 15:18:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-15 15:18:15 -0800 |
| commit | e89102f576e57803186bcbec0507e49885224867 (patch) | |
| tree | a7eb6c85dec2bba8a08ee969b5013ca92485a198 /git-difftool.txt | |
| parent | a8e4261bd5f84cbc59a4a12a7908561671210aba (diff) | |
| download | git-htmldocs-e89102f576e57803186bcbec0507e49885224867.tar.gz | |
Autogenerated HTML docs for v2.12.0-rc1-28-gd09b6
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index 224fb3090..96c26e6aa 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -86,10 +86,11 @@ instead. `--no-symlinks` is the default on Windows. Additionally, `$BASE` is set in the environment. -g:: ---gui:: +--[no-]gui:: 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`. + `diff.guitool` variable instead of `diff.tool`. The `--no-gui` + option can be used to override this setting. --[no-]trust-exit-code:: 'git-difftool' invokes a diff tool individually on each file. |