From: Denton Liu Date: Tue, 7 Feb 2017 06:32:07 +0000 (-0800) Subject: Document the --no-gui option in difftool X-Git-Tag: v2.12.0-rc1~5^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56c2da57fe578d8cb4c6b4fd7d08669944976c35;p=thirdparty%2Fgit.git Document the --no-gui option in difftool Prior to this, the `--no-gui` option was not documented in the manpage. This commit introduces this into the manpage Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- 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.