diff options
| author | Denton Liu <liu.denton@gmail.com> | 2017-02-05 19:41:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-06 10:56:11 -0800 |
| commit | 40e5cf2b0c5422c4baaef7fe0dbc47e1600939b5 (patch) | |
| tree | 29b0d16c6559ccefe8019afe3b61fdea1b957ffc | |
| parent | 6e3a7b3398559305c7a239a42e447c21a8f39ff8 (diff) | |
| download | git-dl/document-that-difftool-takes-no-gui-option.tar.gz | |
Document the --no-gui option in difftooldl/document-that-difftool-takes-no-gui-option
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>
| -rw-r--r-- | Documentation/git-difftool.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 224fb3090b..a2661d9cc5 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. |