From: Denton Liu Date: Mon, 06 Feb 2017 03:41:18 GMT Subject: [PATCH] Document the --no-gui option in difftool Message-ID: <20170206034118.GA29517@arch-attack.localdomain> 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 --- Documentation/git-difftool.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 224fb3090..a2661d9cc 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -87,9 +87,11 @@ instead. `--no-symlinks` is the default on Windows. -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. -- 2.12.0.rc0.208.g81c5d00b2