1GIT-DIFFTOOL(1) Git Manual GIT-DIFFTOOL(1)
2
6 git-difftool - Show changes using common diff tools
7
9 git difftool [<options>] [<commit> [<commit>]] [--] [<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. See git-
15 diff(1).
16
18 -y, --no-prompt
19 Do not prompt before launching a diff tool.
20 --prompt
22 Prompt before each invocation of the diff tool. This is the default
23 behaviour; the option is provided to override any configuration
24 settings.
25 -t <tool>, --tool=<tool>
27 Use the diff tool specified by <tool>. Valid merge tools are:
28 kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
29 ecmerge, diffuse, opendiff, p4merge and araxis.
30 If a diff tool is not specified, git difftool will use the
32 configuration variable diff.tool. If the configuration variable
33 diff.tool is not set, git difftool will pick a suitable default.
34 You can explicitly provide a full path to the tool by setting the
36 configuration variable difftool.<tool>.path. For example, you can
37 configure the absolute path to kdiff3 by setting
38 difftool.kdiff3.path. Otherwise, git difftool assumes the tool is
39 available in PATH.
40 Instead of running one of the known diff tools, git difftool can be
42 customized to run an alternative program by specifying the command
43 line to invoke in a configuration variable difftool.<tool>.cmd.
44 When git difftool is invoked with this tool (either through the -t
46 or --tool option or the diff.tool configuration variable) the
47 configured command line will be invoked with the following
48 variables available: $LOCAL is set to the name of the temporary
49 file containing the contents of the diff pre-image and $REMOTE is
50 set to the name of the temporary file containing the contents of
51 the diff post-image. $MERGED is the name of the file which is
52 being compared. $BASE is provided for compatibility with custom
53 merge tool commands and has the same value as $MERGED.
54 -x <command>, --extcmd=<command>
56 Specify a custom command for viewing diffs. git-difftool ignores
57 the configured defaults and runs $command $LOCAL $REMOTE when this
58 option is specified. Additionally, $BASE is set in the environment.
59 -g, --gui
61 When git-difftool is invoked with the -g or --gui option the
62 default diff tool will be read from the configured diff.guitool
63 variable instead of diff.tool.
64 See git-diff(1) for the full list of supported options.
66
68 git difftool falls back to git mergetool config variables when the
69 difftool equivalents have not been defined.
70 diff.tool
72 The default diff tool to use.
73 diff.guitool
75 The default diff tool to use when --gui is specified.
76 difftool.<tool>.path
78 Override the path for the given tool. This is useful in case your
79 tool is not in the PATH.
80 difftool.<tool>.cmd
82 Specify the command to invoke the specified diff tool.
83 See the --tool=<tool> option above for more details.
85 difftool.prompt
87 Prompt before each invocation of the diff tool.
88
90 git-diff(1)
91 Show changes between commits, commit and working tree, etc
92 git-mergetool(1)
94 Run merge conflict resolution tools to resolve merge conflicts
95 git-config(1)
97 Get and set repository or global options
98
100 Written by David Aguilar <davvid@gmail.com[1]>.
101
103 Documentation by David Aguilar and the git-list
104 <git@vger.kernel.org[2]>.
105
107 Part of the git(1) suite
108
110 1. davvid@gmail.com
111 mailto:davvid@gmail.com
112 2. git@vger.kernel.org
114 mailto:git@vger.kernel.org
115Git 1.7.4.4 04/11/2011 GIT-DIFFTOOL(1)