2009-01-16 09:00:02 +01:00
|
|
|
git-difftool(1)
|
|
|
|
|
===============
|
|
|
|
|
|
|
|
|
|
NAME
|
|
|
|
|
----
|
|
|
|
|
git-difftool - compare changes using common merge tools
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
--------
|
|
|
|
|
'git difftool' [--tool=<tool>] [--no-prompt] ['git diff' options]
|
|
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
-----------
|
2009-01-19 06:27:19 +01:00
|
|
|
'git-difftool' is a git command that allows you to compare and edit files
|
2009-01-16 09:00:02 +01:00
|
|
|
between revisions using common merge tools. At its most basic level,
|
2009-01-19 06:27:19 +01:00
|
|
|
'git-difftool' does what 'git-mergetool' does but its use is for non-merge
|
2009-01-16 09:00:02 +01:00
|
|
|
situations such as when preparing commits or comparing changes against
|
|
|
|
|
the index.
|
|
|
|
|
|
|
|
|
|
'git difftool' is a frontend to 'git diff' and accepts the same
|
|
|
|
|
arguments and options.
|
|
|
|
|
|
2009-01-19 06:27:19 +01:00
|
|
|
See linkgit:git-diff[1] for the full list of supported options.
|
2009-01-16 09:00:02 +01:00
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
|
-------
|
|
|
|
|
-t <tool>::
|
|
|
|
|
--tool=<tool>::
|
|
|
|
|
Use the merge resolution program specified by <tool>.
|
|
|
|
|
Valid merge tools are:
|
|
|
|
|
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
|
|
|
|
|
+
|
2009-01-19 06:27:19 +01:00
|
|
|
If a merge resolution program is not specified, 'git-difftool'
|
2009-01-16 09:00:02 +01:00
|
|
|
will use the configuration variable `merge.tool`. If the
|
|
|
|
|
configuration variable `merge.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 `mergetool.<tool>.path`. For example, you
|
|
|
|
|
can configure the absolute path to kdiff3 by setting
|
2009-01-19 06:27:19 +01:00
|
|
|
`mergetool.kdiff3.path`. Otherwise, 'git-difftool' assumes the
|
2009-01-16 09:00:02 +01:00
|
|
|
tool is available in PATH.
|
|
|
|
|
+
|
|
|
|
|
Instead of running one of the known merge tool programs,
|
2009-01-19 06:27:19 +01:00
|
|
|
'git-difftool' can be customized to run an alternative program
|
2009-01-16 09:00:02 +01:00
|
|
|
by specifying the command line to invoke in a configuration
|
|
|
|
|
variable `mergetool.<tool>.cmd`.
|
|
|
|
|
+
|
2009-01-19 06:27:19 +01:00
|
|
|
When 'git-difftool' is invoked with this tool (either through the
|
2009-01-16 09:00:02 +01:00
|
|
|
`-t` or `--tool` option or the `merge.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. `$BASE` is provided for compatibility
|
|
|
|
|
with custom merge tool commands and has the same value as `$LOCAL`.
|
|
|
|
|
|
|
|
|
|
--no-prompt::
|
2009-01-19 06:27:19 +01:00
|
|
|
Do not prompt before launching a diff tool.
|
2009-01-16 09:00:02 +01:00
|
|
|
|
|
|
|
|
CONFIG VARIABLES
|
|
|
|
|
----------------
|
|
|
|
|
merge.tool::
|
|
|
|
|
The default merge tool to use.
|
|
|
|
|
+
|
|
|
|
|
See the `--tool=<tool>` option above for more details.
|
|
|
|
|
|
|
|
|
|
merge.keepBackup::
|
|
|
|
|
The original, unedited file content can be saved to a file with
|
|
|
|
|
a `.orig` extension. Defaults to `true` (i.e. keep the backup files).
|
|
|
|
|
|
|
|
|
|
mergetool.<tool>.path::
|
|
|
|
|
Override the path for the given tool. This is useful in case
|
|
|
|
|
your tool is not in the PATH.
|
|
|
|
|
|
|
|
|
|
mergetool.<tool>.cmd::
|
|
|
|
|
Specify the command to invoke the specified merge tool.
|
|
|
|
|
+
|
|
|
|
|
See the `--tool=<tool>` option above for more details.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SEE ALSO
|
|
|
|
|
--------
|
2009-01-19 06:27:19 +01:00
|
|
|
linkgit:git-diff[1]::
|
2009-01-16 09:00:02 +01:00
|
|
|
Show changes between commits, commit and working tree, etc
|
|
|
|
|
|
|
|
|
|
linkgit:git-mergetool[1]::
|
|
|
|
|
Run merge conflict resolution tools to resolve merge conflicts
|
|
|
|
|
|
2009-01-19 06:27:19 +01:00
|
|
|
linkgit:git-config[1]::
|
2009-01-16 09:00:02 +01:00
|
|
|
Get and set repository or global options
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AUTHOR
|
|
|
|
|
------
|
|
|
|
|
Written by David Aguilar <davvid@gmail.com>.
|
|
|
|
|
|
|
|
|
|
Documentation
|
|
|
|
|
--------------
|
|
|
|
|
Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
|
|
|
|
|
|
|
|
|
|
GIT
|
|
|
|
|
---
|
|
|
|
|
Part of the linkgit:git[1] suite
|
