1git-difftool(1) 2=============== 3 4NAME 5---- 6git-difftool - Show changes using common diff tools 7 8SYNOPSIS 9-------- 10'git difftool' [--tool=<tool>] [-y|--no-prompt] [<'git diff' options>] 11 12DESCRIPTION 13----------- 14'git-difftool' is a git command that allows you to compare and edit files 15between revisions using common diff tools. 'git difftool' is a frontend 16to 'git-diff' and accepts the same options and arguments. 17 18OPTIONS 19------- 20-y:: 21--no-prompt:: 22 Do not prompt before launching a diff tool. 23 24-t <tool>:: 25--tool=<tool>:: 26 Use the diff tool specified by <tool>. 27 Valid merge tools are: 28 kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, 29 ecmerge, diffuse and opendiff 30+ 31If a diff tool is not specified, 'git-difftool' 32will use the configuration variable `diff.tool`. If the 33configuration variable `diff.tool` is not set, 'git-difftool' 34will pick a suitable default. 35+ 36You can explicitly provide a full path to the tool by setting the 37configuration variable `difftool.<tool>.path`. For example, you 38can configure the absolute path to kdiff3 by setting 39`difftool.kdiff3.path`. Otherwise, 'git-difftool' assumes the 40tool is available in PATH. 41+ 42Instead of running one of the known diff tools, 43'git-difftool' can be customized to run an alternative program 44by specifying the command line to invoke in a configuration 45variable `difftool.<tool>.cmd`. 46+ 47When 'git-difftool' is invoked with this tool (either through the 48`-t` or `--tool` option or the `diff.tool` configuration variable) 49the configured command line will be invoked with the following 50variables available: `$LOCAL` is set to the name of the temporary 51file containing the contents of the diff pre-image and `$REMOTE` 52is set to the name of the temporary file containing the contents 53of the diff post-image. `$BASE` is provided for compatibility 54with custom merge tool commands and has the same value as `$LOCAL`. 55 56See linkgit:git-diff[1] for the full list of supported options. 57 58CONFIG VARIABLES 59---------------- 60'git-difftool' falls back to 'git-mergetool' config variables when the 61difftool equivalents have not been defined. 62 63diff.tool:: 64 The default diff tool to use. 65 66difftool.<tool>.path:: 67 Override the path for the given tool. This is useful in case 68 your tool is not in the PATH. 69 70difftool.<tool>.cmd:: 71 Specify the command to invoke the specified diff tool. 72+ 73See the `--tool=<tool>` option above for more details. 74 75SEE ALSO 76-------- 77linkgit:git-diff[1]:: 78 Show changes between commits, commit and working tree, etc 79 80linkgit:git-mergetool[1]:: 81 Run merge conflict resolution tools to resolve merge conflicts 82 83linkgit:git-config[1]:: 84 Get and set repository or global options 85 86 87AUTHOR 88------ 89Written by David Aguilar <davvid@gmail.com>. 90 91Documentation 92-------------- 93Documentation by David Aguilar and the git-list <git@vger.kernel.org>. 94 95GIT 96--- 97Part of the linkgit:git[1] suite