Skip to content

Commit

Permalink
Document the --no-gui option in difftool
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
Denton-L authored and gitster committed Feb 8, 2017
1 parent 6e3a7b3 commit 56c2da5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Documentation/git-difftool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 56c2da5

Please sign in to comment.