Merge branch 'mg/timestamp-t-fix'

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 224fb3090bba3f9dfd98448019a2ff6303b268f7..96c26e6aa82c98da1652023f0d04b4b63c8a4944 100644 (file)
--- 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.