Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Document the --no-gui option in difftool
author
Denton Liu
<liu.denton@gmail.com>
Tue, 7 Feb 2017 06:32:07 +0000
(22:32 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 8 Feb 2017 21:30:28 +0000
(13:30 -0800)
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>
Documentation/git-difftool.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
6e3a7b3
)
diff --git
a/Documentation/git-difftool.txt
b/Documentation/git-difftool.txt
index 224fb3090bba3f9dfd98448019a2ff6303b268f7..96c26e6aa82c98da1652023f0d04b4b63c8a4944 100644
(file)
--- 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.