git-difftool

git difftool [options] [commit] [--] [files...]

git difftool launches external visual diff tools to review changes in Git repositories. It is a frontend to git diff and accepts the same options and arguments, but hands the actual comparison off to a graphical or terminal-based diff application instead of printing a unified diff.The command supports a wide variety of diff tools including vimdiff, meld, kdiff3, emerge, and opendiff; run git difftool --tool-help to see which are detected. Directory diff mode (-d) is particularly useful for graphical tools that support comparing entire directory trees simultaneously, since it stages a temporary copy of both trees rather than invoking the tool once per file.

-t tool, --tool tool

Use specific diff tool instead of the configured default.

Don't prompt before launching each diff tool instance.

Prompt before each invocation (default behavior; overrides config).

Copy modified files to a temp location and diff entire directory trees at once. Never prompts.

Use the tool configured in diff.guitool instead of diff.tool.

Compare staged changes (same as git diff --staged).

List available tools recognized on this system.

Run a custom command as `cmd $LOCAL $REMOTE`, ignoring configured tools.

In dir-diff mode, copy files instead of symlinking unchanged ones (always on for Windows).

Exit with the invoked tool's exit code instead of ignoring it.

diff.tool

Default tool used by difftool (and --gui falls back through merge.guitool, diff.tool, merge.tool).

Explicit path to a tool's executable, when it isn't on PATH.

Custom command line for a tool, with $LOCAL, $REMOTE, $MERGED, and $BASE available.

Whether to prompt before launching each instance (default true).

Errors from the diff tool are ignored unless --trust-exit-code is set. Directory diff mode discards tool-specific per-file invocation, which can behave differently for tools expecting single-file input.

git-diff(1), git-mergetool(1), git-log(1)

Source code · Homepage · Documentation