mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'dl/difftool-doc-no-gui-option'
Doc update. * dl/difftool-doc-no-gui-option: Document the --no-gui option in difftool
This commit is contained in:
commit
0ffe1c9c5f
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue