summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-10 12:52:26 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-10 12:52:26 -0800
commit0ffe1c9c5f2ee6e2efeccff6cf67674130a9c39a (patch)
tree90d9f935221147a2c4c2a09ebfd55be587f26c3d
parent163d24dc4d914191d1981ed0d9fa2a5d91b7d412 (diff)
parent56c2da57fe578d8cb4c6b4fd7d08669944976c35 (diff)
downloadgit-0ffe1c9c5f2ee6e2efeccff6cf67674130a9c39a.tar.gz
Merge branch 'dl/difftool-doc-no-gui-option'
Doc update. * dl/difftool-doc-no-gui-option: Document the --no-gui option in difftool
-rw-r--r--Documentation/git-difftool.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 224fb3090b..96c26e6aa8 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/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.