undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/difftool-doc-no-gui-option'

Browse Source 
Doc update.

* dl/difftool-doc-no-gui-option:
  Document the --no-gui option in difftool
This commit is contained in:
Junio C Hamano 2017-02-10 12:52:26 -08:00
commit 0ffe1c9c5f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-difftool.txt
View File

@ -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.