NAME
git-difftool - Show changes using common diff tools
SYNOPSIS
git difftool\n [<options>] [<commit> [<commit>]] [--] [<path>...]DESCRIPTION
git difftool is a Git command that allows you to compare and edit files between revisions using common diff tools. git difftool is a frontend to git diff and accepts the same options and arguments. See git-diff(1).
OPTIONS
-d, --dir-diff
-y, --no-prompt
--prompt
--rotate-to=<file>
--skip-to=<file>
-t <tool>, --tool=<tool>
If a diff tool is not specified, git difftool will use the configuration variable diff.tool. If the configuration variable diff.tool is not set, git difftool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable difftool.<tool>.path. For example, you can configure the absolute path to kdiff3 by setting difftool.kdiff3.path. Otherwise, git difftool assumes the tool is available in PATH.
Instead of running one of the known diff tools, git difftool can be customized to run an alternative program by specifying the command line to invoke in a configuration variable difftool.<tool>.cmd.
When git difftool is invoked with this tool (either through the -t or --tool option or the diff.tool configuration variable) the configured command line will be invoked with the following variables available: $LOCAL is set to the name of the temporary file containing the contents of the diff pre-image and $REMOTE is set to the name of the temporary file containing the contents of the diff post-image. $MERGED is the name of the file which is being compared. $BASE is provided for compatibility with custom merge tool commands and has the same value as $MERGED.
--tool-help
--[no-]symlinks
Specifying --no-symlinks instructs git difftool to create copies instead. --no-symlinks is the default on Windows.
-x <command>, --extcmd=<command>
-g, --[no-]gui
--[no-]trust-exit-code
git-difftool will forward the exit code of the invoked tool when --trust-exit-code is used.
See git-diff(1) for the full list of supported options.
CONFIGURATION
git difftool falls back to git mergetool config variables when the difftool equivalents have not been defined.
Everything above this line in this section isn’t included from the git-config(1) documentation. The content that follows is the same as what’s found there:
diff.tool
diff.guitool
difftool.<tool>.cmd
See the --tool=<tool> option in git-difftool(1) for more details.
difftool.<tool>.path
difftool.trustExitCode
See the --trust-exit-code option in git-difftool(1) for more details.
difftool.prompt
difftool.guiDefault
SEE ALSO
git-diff(1)
git-mergetool(1)
git-config(1)
GIT
Part of the git(1) suite