ꦫꦣꦺꦤ꧀ꦄꦤ꧀ꦠꦱꦺꦤ

PATH: usr / share / doc / git-1.8.3.1

git-difftool(1)
===============

NAME
----
git-difftool - Show changes using common diff tools

SYNOPSIS
--------
[verse]
'git difftool' [<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
linkgit:git-diff[1].

OPTIONS
-------
-d::
--dir-diff::
	Copy the modified files to a temporary location and perform
	a directory diff on them. This mode never prompts before
	launching the diff tool.

-y::
--no-prompt::
	Do not prompt before launching a diff tool.

--prompt::
	Prompt before each invocation of the diff tool.
	This is the default behaviour; the option is provided to
	override any configuration settings.

-t <tool>::
--tool=<tool>::
	Use the diff tool specified by <tool>.  Valid values include
	emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help`
	for the list of valid <tool> settings.
+
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::
	Print a list of diff tools that may be used with `--tool`.

--[no-]symlinks::
	'git difftool''s default behavior is create symlinks to the
	working tree when run in `--dir-diff` mode and the right-hand
	side of the comparison yields the same content as the file in
	the working tree.
+
Specifying `--no-symlinks` instructs 'git difftool' to create copies
instead.  `--no-symlinks` is the default on Windows.

-x <command>::
--extcmd=<command>::
	Specify a custom command for viewing diffs.
	'git-difftool' ignores the configured defaults and runs
	`$command $LOCAL $REMOTE` when this option is specified.
	Additionally, `$BASE` is set in the environment.

-g::
--gui::
	When 'git-difftool' is invoked with the `-g` or `--gui` option
	the default diff tool will be read from the configured
	`diff.guitool` variable instead of `diff.tool`.

See linkgit:git-diff[1] for the full list of supported options.

CONFIG VARIABLES
----------------
'git difftool' falls back to 'git mergetool' config variables when the
difftool equivalents have not been defined.

diff.tool::
	The default diff tool to use.

diff.guitool::
	The default diff tool to use when `--gui` is specified.

difftool.<tool>.path::
	Override the path for the given tool.  This is useful in case
	your tool is not in the PATH.

difftool.<tool>.cmd::
	Specify the command to invoke the specified diff tool.
+
See the `--tool=<tool>` option above for more details.

difftool.prompt::
	Prompt before each invocation of the diff tool.

SEE ALSO
--------
linkgit:git-diff[1]::
	 Show changes between commits, commit and working tree, etc

linkgit:git-mergetool[1]::
	Run merge conflict resolution tools to resolve merge conflicts

linkgit:git-config[1]::
	 Get and set repository or global options

GIT
---
Part of the linkgit:git[1] suite

[+] ..
[-] gitworkflows.txt [edit]
[-] git-name-rev.txt [edit]
[-] git-status.html [edit]
[-] git-difftool.txt [edit]
[-] git-blame.html [edit]
[-] git-rebase.html [edit]
[-] git-push.html [edit]
[-] git-count-objects.txt [edit]
[-] mergetools-merge.txt [edit]
[-] git-show-index.txt [edit]
[-] gitcredentials.txt [edit]
[-] git-status.txt [edit]
[-] cmds-plumbinginterrogators.txt [edit]
[-] git.txt [edit]
[-] COPYING [edit]
[-] git-replace.txt [edit]
[-] git-cvsserver.txt [edit]
[-] git-apply.html [edit]
[-] gitweb.html [edit]
[-] git-rm.html [edit]
[-] git-cvsserver.html [edit]
[-] git-fetch.html [edit]
[-] git-daemon.html [edit]
[-] mailmap.txt [edit]
[-] git-for-each-ref.html [edit]
[-] gitk.txt [edit]
[-] diff-format.txt [edit]
[-] git-parse-remote.html [edit]
[-] gittutorial-2.html [edit]
[-] git-repack.txt [edit]
[-] gitcvs-migration.html [edit]
[-] gitrevisions.txt [edit]
[-] git-ls-files.html [edit]
[-] git-rev-parse.html [edit]
[-] git-show-ref.html [edit]
[-] blame-options.txt [edit]
[-] git-rev-list.txt [edit]
[-] git-index-pack.txt [edit]
[-] git-credential-cache.txt [edit]
[-] git-show-ref.txt [edit]
[-] pretty-formats.txt [edit]
[-] git-shortlog.txt [edit]
[-] pull-fetch-param.txt [edit]
[-] git-rev-list.html [edit]
[-] git-fmt-merge-msg.html [edit]
[-] git-clean.txt [edit]
[-] git-notes.txt [edit]
[-] git-count-objects.html [edit]
[-] git-clean.html [edit]
[-] git.html [edit]
[-] git-show-index.html [edit]
[-] git-fsck.html [edit]
[-] gitrepository-layout.html [edit]
[-] git-cvsimport.txt [edit]
[-] git-commit.html [edit]
[-] git-tag.html [edit]
[-] git-reflog.txt [edit]
[-] git-sh-i18n.txt [edit]
[-] git-stripspace.html [edit]
[-] gitweb.txt [edit]
[-] gitglossary.txt [edit]
[-] git-shell.txt [edit]
[-] git-prune.txt [edit]
[-] gitignore.html [edit]
[-] git-fast-export.html [edit]
[-] git-get-tar-commit-id.html [edit]
[-] git-http-fetch.html [edit]
[-] gitweb.conf.html [edit]
[-] git-notes.html [edit]
[-] git-update-index.html [edit]
[-] git-mailsplit.txt [edit]
[-] cmds-synchingrepositories.txt [edit]
[-] git-unpack-file.txt [edit]
[-] git-verify-tag.html [edit]
[-] gitdiffcore.html [edit]
[-] git-branch.txt [edit]
[-] git-request-pull.html [edit]
[-] git-diff-files.txt [edit]
[-] git-log.html [edit]
[-] git-check-ignore.html [edit]
[-] git-checkout-index.txt [edit]
[-] git-cherry.html [edit]
[-] git-diff-files.html [edit]
[-] git-receive-pack.txt [edit]
[-] git-mktree.html [edit]
[-] git-instaweb.html [edit]
[-] git-merge-file.html [edit]
[-] README [edit]
[-] git-stage.html [edit]
[+] howto
[-] git-tools.html [edit]
[-] fetch-options.txt [edit]
[-] git-remote.txt [edit]
[-] git-merge-base.txt [edit]
[-] git-pull.html [edit]
[-] git-merge-index.html [edit]
[-] githooks.txt [edit]
[-] git-svn.txt [edit]
[-] git-repo-config.html [edit]
[-] git-instaweb.txt [edit]
[+] contrib
[-] git-describe.html [edit]
[-] gitattributes.html [edit]
[-] gitcli.html [edit]
[-] git-fast-import.txt [edit]
[-] git-checkout.html [edit]
[-] merge-config.txt [edit]
[-] revisions.txt [edit]
[-] git-gc.txt [edit]
[-] git-credential-store.txt [edit]
[-] git-update-server-info.txt [edit]
[-] git-rm.txt [edit]
[-] cmds-ancillarymanipulators.txt [edit]
[-] git-mailsplit.html [edit]
[-] git-merge-one-file.txt [edit]
[-] git-help.html [edit]
[-] git-sh-i18n--envsubst.html [edit]
[-] git-reflog.html [edit]
[-] git-http-fetch.txt [edit]
[-] git-check-ref-format.html [edit]
[-] git-commit.txt [edit]
[-] git-p4.txt [edit]
[-] git-rev-parse.txt [edit]
[-] git-check-ref-format.txt [edit]
[-] git-merge-tree.html [edit]
[-] git-read-tree.txt [edit]
[-] git-check-attr.html [edit]
[-] git-mailinfo.txt [edit]
[-] git-mv.html [edit]
[-] git-quiltimport.txt [edit]
[-] git-daemon.txt [edit]
[-] git-ls-files.txt [edit]
[-] git-web--browse.txt [edit]
[-] git-patch-id.txt [edit]
[-] git-bisect-lk2009.html [edit]
[-] git-stripspace.txt [edit]
[-] gitmodules.html [edit]
[-] git-archive.html [edit]
[-] git-gc.html [edit]
[-] git-gui.txt [edit]
[-] pretty-options.txt [edit]
[-] git-column.txt [edit]
[-] git-fetch-pack.txt [edit]
[-] git-log.txt [edit]
[-] gitworkflows.html [edit]
[-] gitcore-tutorial.html [edit]
[-] git-prune.html [edit]
[-] git-cvsexportcommit.txt [edit]
[-] git-rerere.txt [edit]
[-] gitremote-helpers.html [edit]
[-] git-quiltimport.html [edit]
[-] git-fsck.txt [edit]
[-] git-peek-remote.txt [edit]
[-] git-imap-send.txt [edit]
[-] gitk.html [edit]
[-] git-hash-object.html [edit]
[-] git-push.txt [edit]
[-] git-blame.txt [edit]
[-] git-upload-archive.html [edit]
[-] git-replace.html [edit]
[+] technical
[-] git-upload-pack.html [edit]
[-] git-sh-i18n.html [edit]
[-] git-init.html [edit]
[-] git-bisect.txt [edit]
[-] git-http-push.html [edit]
[-] git-diff-index.html [edit]
[-] git-lost-found.html [edit]
[-] git-http-backend.html [edit]
[-] date-formats.txt [edit]
[-] git-mailinfo.html [edit]
[-] git-show-branch.html [edit]
[-] gitnamespaces.txt [edit]
[-] git-cherry.txt [edit]
[-] git-grep.html [edit]
[-] git-repo-config.txt [edit]
[-] git-ls-tree.html [edit]
[-] git-bisect.html [edit]
[-] git-send-email.txt [edit]
[-] git-credential-store.html [edit]
[-] git-rerere.html [edit]
[-] git-var.html [edit]
[-] git-remote.html [edit]
[-] git-tools.txt [edit]
[-] git-pack-objects.txt [edit]
[-] git-credential-cache--daemon.html [edit]
[-] git-update-index.txt [edit]
[-] git-gui.html [edit]
[-] git-svn.html [edit]
[-] gitweb.conf.txt [edit]
[-] gitignore.txt [edit]
[-] git-http-backend.txt [edit]
[-] howto-index.html [edit]
[-] git-stash.html [edit]
[-] git-mergetool.html [edit]
[-] git-relink.txt [edit]
[-] git-for-each-ref.txt [edit]
[-] cmds-foreignscminterface.txt [edit]
[-] git-shortlog.html [edit]
[-] cmds-ancillaryinterrogators.txt [edit]
[-] git-credential.txt [edit]
[-] git-mergetool--lib.html [edit]
[-] git-submodule.txt [edit]
[-] git-repack.html [edit]
[-] git-merge.html [edit]
[-] git-show.txt [edit]
[-] gitcvs-migration.txt [edit]
[-] diff-options.txt [edit]
[-] git-sh-setup.html [edit]
[-] git-config.html [edit]
[-] git-annotate.txt [edit]
[-] gitglossary.html [edit]
[-] git-pull.txt [edit]
[-] git-mergetool--lib.txt [edit]
[-] rev-list-options.txt [edit]
[-] git-fetch.txt [edit]
[-] gitcli.txt [edit]
[-] git-fsck-objects.html [edit]
[-] git-stash.txt [edit]
[-] git-pack-refs.html [edit]
[-] git-reset.txt [edit]
[-] cmds-mainporcelain.txt [edit]
[-] git-hash-object.txt [edit]
[-] gitmodules.txt [edit]
[-] git-cat-file.html [edit]
[-] git-bisect-lk2009.txt [edit]
[-] git-receive-pack.html [edit]
[-] git-p4.html [edit]
[-] mergetools-diff.txt [edit]
[-] git-cvsimport.html [edit]
[-] gitremote-helpers.txt [edit]
[-] git-column.html [edit]
[-] git-prune-packed.html [edit]
[-] glossary-content.txt [edit]
[+] RelNotes
[-] git-rebase.txt [edit]
[-] git-config.txt [edit]
[-] git-pack-refs.txt [edit]
[-] git-merge-index.txt [edit]
[-] git-add.html [edit]
[-] gitrevisions.html [edit]
[-] git-cherry-pick.txt [edit]
[-] git-symbolic-ref.txt [edit]
[-] git-annotate.html [edit]
[-] git-clone.txt [edit]
[-] git-parse-remote.txt [edit]
[-] git-diff.html [edit]
[-] git-diff-index.txt [edit]
[-] git-mergetool.txt [edit]
[-] git-update-ref.txt [edit]
[-] git-lost-found.txt [edit]
[-] git-tar-tree.txt [edit]
[-] git-update-server-info.html [edit]
[-] git-upload-pack.txt [edit]
[-] git-commit-tree.txt [edit]
[-] git-clone.html [edit]
[-] git-help.txt [edit]
[-] git-send-email.html [edit]
[-] everyday.html [edit]
[-] git-index-pack.html [edit]
[-] git-mktree.txt [edit]
[-] git-fast-import.html [edit]
[-] git-bundle.txt [edit]
[-] git-am.txt [edit]
[-] gittutorial-2.txt [edit]
[-] git-remote-testgit.html [edit]
[-] git-diff-tree.txt [edit]
[-] cmds-synchelpers.txt [edit]
[-] git-diff-tree.html [edit]
[-] git-prune-packed.txt [edit]
[-] cmds-plumbingmanipulators.txt [edit]
[-] howto-index.txt [edit]
[-] git-tag.txt [edit]
[-] git-send-pack.html [edit]
[-] git-credential-cache--daemon.txt [edit]
[-] config.txt [edit]
[-] git-remote-fd.html [edit]
[-] git-revert.txt [edit]
[-] gitdiffcore.txt [edit]
[-] git-fast-export.txt [edit]
[-] git-upload-archive.txt [edit]
[-] git-diff.txt [edit]
[-] git-merge-one-file.html [edit]
[-] git-archive.txt [edit]
[-] diff-generate-patch.txt [edit]
[-] git-http-push.txt [edit]
[-] git-init-db.html [edit]
[-] git-cat-file.txt [edit]
[-] git-fetch-pack.html [edit]
[-] git-whatchanged.html [edit]
[-] git-cvsexportcommit.html [edit]
[-] git-patch-id.html [edit]
[-] git-name-rev.html [edit]
[-] git-apply.txt [edit]
[-] gittutorial.txt [edit]
[-] git-shell.html [edit]
[-] git-verify-pack.html [edit]
[-] git-write-tree.html [edit]
[-] git-request-pull.txt [edit]
[-] git-remote-testgit.txt [edit]
[-] merge-strategies.txt [edit]
[-] git-write-tree.txt [edit]
[-] git-init-db.txt [edit]
[-] git-revert.html [edit]
[-] git-remote-ext.html [edit]
[-] urls.txt [edit]
[-] git-credential.html [edit]
[-] git-peek-remote.html [edit]
[-] git-stage.txt [edit]
[-] git-am.html [edit]
[-] git-verify-pack.txt [edit]
[-] git-filter-branch.txt [edit]
[-] git-unpack-objects.html [edit]
[-] git-format-patch.html [edit]
[-] diff-config.txt [edit]
[-] git-remote-helpers.html [edit]
[-] git-pack-redundant.txt [edit]
[-] git-verify-tag.txt [edit]
[-] git-describe.txt [edit]
[-] git-remote-fd.txt [edit]
[-] git-bundle.html [edit]
[-] git-show.html [edit]
[-] gitattributes.txt [edit]
[-] gittutorial.html [edit]
[-] git-ls-tree.txt [edit]
[-] git-get-tar-commit-id.txt [edit]
[-] git-branch.html [edit]
[-] merge-options.txt [edit]
[-] git-filter-branch.html [edit]
[-] i18n.txt [edit]
[-] git-check-ignore.txt [edit]
[-] git-tar-tree.html [edit]
[-] git-sh-i18n--envsubst.txt [edit]
[-] git-whatchanged.txt [edit]
[-] gitcore-tutorial.txt [edit]
[-] gitrepository-layout.txt [edit]
[-] git-mktag.txt [edit]
[-] git-fmt-merge-msg.txt [edit]
[-] git-ls-remote.html [edit]
[-] git-citool.html [edit]
[-] git-citool.txt [edit]
[-] user-manual.html [edit]
[-] git-pack-redundant.html [edit]
[-] git-mv.txt [edit]
[-] git-submodule.html [edit]
[-] git-grep.txt [edit]
[-] git-unpack-file.html [edit]
[-] git-mktag.html [edit]
[-] git-update-ref.html [edit]
[-] git-symbolic-ref.html [edit]
[-] githooks.html [edit]
[-] git-pack-objects.html [edit]
[-] git-cherry-pick.html [edit]
[-] everyday.txt [edit]
[-] git-unpack-objects.txt [edit]
[-] git-read-tree.html [edit]
[-] git-show-branch.txt [edit]
[-] git-merge-tree.txt [edit]
[-] git-merge.txt [edit]
[-] git-ls-remote.txt [edit]
[-] git-merge-base.html [edit]
[-] git-imap-send.html [edit]
[-] gitcredentials.html [edit]
[-] git-commit-tree.html [edit]
[-] git-format-patch.txt [edit]
[-] git-web--browse.html [edit]
[-] git-sh-setup.txt [edit]
[-] git-var.txt [edit]
[-] gitnamespaces.html [edit]
[-] git-add.txt [edit]
[-] git-checkout-index.html [edit]
[-] docbook-xsl.css [edit]
[-] git-merge-file.txt [edit]
[-] git-reset.html [edit]
[-] git-fsck-objects.txt [edit]
[-] git-check-attr.txt [edit]
[-] git-difftool.html [edit]
[-] urls-remotes.txt [edit]
[-] git-send-pack.txt [edit]
[-] git-remote-ext.txt [edit]
[-] git-checkout.txt [edit]
[-] git-relink.html [edit]
[-] user-manual.txt [edit]
[-] sequencer.txt [edit]
[-] git-credential-cache.html [edit]
[-] cmds-purehelpers.txt [edit]
[-] git-init.txt [edit]