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>
Denton Liu committed
Feb 6, 2017 at 22:32 UTC
56c2da57fe578d8cb4c6b4fd7d08669944976c35
1 file changed
+3
-2
Documentation/git-difftool.txt
+3
-2
@@ -86,10 +86,11 @@ instead. `--no-symlinks` is the default on Windows.
86
Additionally, `$BASE` is set in the environment.
87
88
-g::
89
---gui::
89
+--[no-]gui::
90
When 'git-difftool' is invoked with the `-g` or `--gui` option
91
the default diff tool will be read from the configured
92
- `diff.guitool` variable instead of `diff.tool`.
92
+ `diff.guitool` variable instead of `diff.tool`. The `--no-gui`
93
+ option can be used to override this setting.
94
95
--[no-]trust-exit-code::
96
'git-difftool' invokes a diff tool individually on each file.