mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
6e3a7b3398
commit
56c2da57fe
|
@ -86,10 +86,11 @@ instead. `--no-symlinks` is the default on Windows.
|
||||||
Additionally, `$BASE` is set in the environment.
|
Additionally, `$BASE` is set in the environment.
|
||||||
|
|
||||||
-g::
|
-g::
|
||||||
--gui::
|
--[no-]gui::
|
||||||
When 'git-difftool' is invoked with the `-g` or `--gui` option
|
When 'git-difftool' is invoked with the `-g` or `--gui` option
|
||||||
the default diff tool will be read from the configured
|
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::
|
--[no-]trust-exit-code::
|
||||||
'git-difftool' invokes a diff tool individually on each file.
|
'git-difftool' invokes a diff tool individually on each file.
|
||||||
|
|
Loading…
Reference in a new issue