[PATCH v2] Document the --no-gui option in difftool
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Feb 7, 2017, 06:32 UTC
- Message-ID
- <20170207063207.GA12746@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 <liu.denton@gmail.com> --- Documentation/git-difftool.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 224fb3090..96c26e6aa 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.
-- 2.11.1