diff options
| author | Denton Liu <liu.denton@gmail.com> | 2017-02-06 22:32:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-08 13:30:28 -0800 |
| commit | 56c2da57fe578d8cb4c6b4fd7d08669944976c35 (patch) | |
| tree | b84782bd7dbdda22cc8024400c7bb6c64c967582 /Documentation/git-difftool.txt | |
| parent | 6e3a7b3398559305c7a239a42e447c21a8f39ff8 (diff) | |
| download | git-56c2da57fe578d8cb4c6b4fd7d08669944976c35.tar.gz | |
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 <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 5 |
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. |