diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 00:42:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 00:42:16 +0000 |
| commit | a9701f0184382d8de7380c56558718915905746a (patch) | |
| tree | 25620bdfe6b5a66edecbbd6153f50dc5cb1e88f9 /git-difftool.txt | |
| parent | 19107ef38294e3b64a70b32302416dd52c0e779a (diff) | |
| download | git-htmldocs-a9701f0184382d8de7380c56558718915905746a.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-336-g19c6
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index 8e9aed67d..5c68cff90 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -7,7 +7,7 @@ git-difftool - Show changes using common diff tools SYNOPSIS -------- -'git difftool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<'git diff' options>] +'git difftool' [<options>] <commit>{0,2} [--] [<path>...] DESCRIPTION ----------- @@ -58,6 +58,18 @@ is set to the name of the temporary file containing the contents of the diff post-image. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$LOCAL`. +-x <command>:: +--extcmd=<command>:: + Specify a custom command for viewing diffs. + 'git-difftool' ignores the configured defaults and runs + `$command $LOCAL $REMOTE` when this option is specified. + +-g:: +--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`. + See linkgit:git-diff[1] for the full list of supported options. CONFIG VARIABLES @@ -68,6 +80,9 @@ difftool equivalents have not been defined. diff.tool:: The default diff tool to use. +diff.guitool:: + The default diff tool to use when `--gui` is specified. + difftool.<tool>.path:: Override the path for the given tool. This is useful in case your tool is not in the PATH. |