1GIT-DIFFTOOL(1) Git Manual GIT-DIFFTOOL(1)
2
6 git-difftool - Show changes using common diff tools
7
9 git difftool [<options>] <commit>{0,2} [--] [<path>...]
10
12 git difftool is a git command that allows you to compare and edit files
13 between revisions using common diff tools. git difftool is a frontend
14 to git diff and accepts the same options and arguments.
15
17 -y, --no-prompt
18 Do not prompt before launching a diff tool.
19 --prompt
21 Prompt before each invocation of the diff tool. This is the default
22 behaviour; the option is provided to override any configuration
23 settings.
24 -t <tool>, --tool=<tool>
26 Use the diff tool specified by <tool>. Valid merge tools are:
27 kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
28 ecmerge, diffuse, opendiff, p4merge and araxis.
29 If a diff tool is not specified, git difftool will use the
31 configuration variable diff.tool. If the configuration variable
32 diff.tool is not set, git difftool will pick a suitable default.
33 You can explicitly provide a full path to the tool by setting the
35 configuration variable difftool.<tool>.path. For example, you can
36 configure the absolute path to kdiff3 by setting
37 difftool.kdiff3.path. Otherwise, git difftool assumes the tool is
38 available in PATH.
39 Instead of running one of the known diff tools, git difftool can be
41 customized to run an alternative program by specifying the command
42 line to invoke in a configuration variable difftool.<tool>.cmd.
43 When git difftool is invoked with this tool (either through the -t
45 or --tool option or the diff.tool configuration variable) the
46 configured command line will be invoked with the following
47 variables available: $LOCAL is set to the name of the temporary
48 file containing the contents of the diff pre-image and $REMOTE is
49 set to the name of the temporary file containing the contents of
50 the diff post-image. $BASE is provided for compatibility with
51 custom merge tool commands and has the same value as $LOCAL.
52 -x <command>, --extcmd=<command>
54 Specify a custom command for viewing diffs. git-difftool ignores
55 the configured defaults and runs $command $LOCAL $REMOTE when this
56 option is specified.
57 -g, --gui
59 When git-difftool is invoked with the -g or --gui option the
60 default diff tool will be read from the configured diff.guitool
61 variable instead of diff.tool.
62 See git-diff(1) for the full list of supported options.
64
66 git difftool falls back to git mergetool config variables when the
67 difftool equivalents have not been defined.
68 diff.tool
70 The default diff tool to use.
71 diff.guitool
73 The default diff tool to use when --gui is specified.
74 difftool.<tool>.path
76 Override the path for the given tool. This is useful in case your
77 tool is not in the PATH.
78 difftool.<tool>.cmd
80 Specify the command to invoke the specified diff tool.
81 See the --tool=<tool> option above for more details.
83 difftool.prompt
85 Prompt before each invocation of the diff tool.
86
88 git-diff(1)
89 Show changes between commits, commit and working tree, etc
90 git-mergetool(1)
92 Run merge conflict resolution tools to resolve merge conflicts
93 git-config(1)
95 Get and set repository or global options
96
98 Written by David Aguilar <davvid@gmail.com[1]>.
99
101 Documentation by David Aguilar and the git-list
102 <git@vger.kernel.org[2]>.
103
105 Part of the git(1) suite
106
108 1. davvid@gmail.com
109 mailto:davvid@gmail.com
110 2. git@vger.kernel.org
112 mailto:git@vger.kernel.org
113Git 1.7.1 08/16/2017 GIT-DIFFTOOL(1)