Setup and Config
Getting and Creating Projects
Basic Snapshotting
Branching and Merging
Sharing and Updating Projects
Inspection and Comparison
Patching
Debugging
External Systems
Server Admin
Guides
- gitattributes
- Command-line interface conventions
- Everyday Git
- Frequently Asked Questions (FAQ)
- Glossary
- Hooks
- gitignore
- gitmodules
- Revisions
- Submodules
- Tutorial
- Workflows
- All guides...
Administration
Plumbing Commands
- 2.45.1 → 2.47.0 no changes
- 2.45.0 no changes
- 2.44.1 → 2.44.2 no changes
-
2.44.0
02/23/24
- 2.43.1 → 2.43.5 no changes
-
2.43.0
11/20/23
- 2.41.1 → 2.42.3 no changes
-
2.41.0
06/01/23
- 2.38.1 → 2.40.3 no changes
-
2.38.0
10/02/22
- 2.31.1 → 2.37.7 no changes
-
2.31.0
03/15/21
- 2.22.1 → 2.30.9 no changes
-
2.22.0
06/07/19
- 2.13.7 → 2.21.4 no changes
-
2.12.5
09/22/17
- 2.10.5 → 2.11.4 no changes
-
2.9.5
07/30/17
- 2.3.10 → 2.8.6 no changes
-
2.2.3
09/04/15
- 2.1.4 no changes
-
2.0.5
12/17/14
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 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.
- --rotate-to=<file>
-
Start showing the diff for the given path, the paths before it will move to end and output.
- --skip-to=<file>
-
Start showing the diff for the given path, skipping all the paths before it.
- -t <tool>
- --tool=<tool>
-
Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run
git difftool --tool-helpfor 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 variablediff.toolis 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 settingdifftool.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
-tor--tooloption or thediff.toolconfiguration variable) the configured command line will be invoked with the following variables available:$LOCALis set to the name of the temporary file containing the contents of the diff pre-image and$REMOTEis set to the name of the temporary file containing the contents of the diff post-image.$MERGEDis the name of the file which is being compared.$BASEis 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-diffmode and the right-hand side of the comparison yields the same content as the file in the working tree.Specifying
--no-symlinksinstructs git difftool to create copies instead.--no-symlinksis 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 $REMOTEwhen this option is specified. Additionally,$BASEis set in the environment. - -g
- --[no-]gui
-
When git-difftool is invoked with the
-gor--guioption the default diff tool will be read from the configureddiff.guitoolvariable instead ofdiff.tool. This may be selected automatically using the configuration variabledifftool.guiDefault. The--no-guioption can be used to override these settings. Ifdiff.guitoolis not set, we will fallback in the order ofmerge.guitool,diff.tool,merge.tooluntil a tool is found. - --[no-]trust-exit-code
-
git-difftool invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use
--trust-exit-codeto make git-difftool exit when an invoked diff tool returns a non-zero exit code.git-difftool will forward the exit code of the invoked tool when
--trust-exit-codeis used.
See git-diff[1] for the full list of supported options.
CONFIGURATION
git difftool falls back to git mergetool config variables when the difftool equivalents have not been defined.
Everything above this line in this section isn’t included from the git-config[1] documentation. The content that follows is the same as what’s found there:
- diff.tool
-
Controls which diff tool is used by git-difftool[1]. This variable overrides the value configured in
merge.tool. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined. - diff.guitool
-
Controls which diff tool is used by git-difftool[1] when the -g/--gui flag is specified. This variable overrides the value configured in
merge.guitool. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<guitool>.cmd variable is defined. - difftool.<tool>.cmd
-
Specify the command to invoke the specified diff tool. The specified command is evaluated in shell 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.
See the
--tool=<tool>option in git-difftool[1] for more details. - difftool.<tool>.path
-
Override the path for the given tool. This is useful in case your tool is not in the PATH.
- difftool.trustExitCode
-
Exit difftool if the invoked diff tool returns a non-zero exit status.
See the
--trust-exit-codeoption in git-difftool[1] for more details. - difftool.prompt
-
Prompt before each invocation of the diff tool.
- difftool.guiDefault
-
Set
trueto use thediff.guitoolby default (equivalent to specifying the--guiargument), orautoto selectdiff.guitoolordiff.tooldepending on the presence of aDISPLAYenvironment variable value. The default isfalse, where the--guiargument must be provided explicitly for thediff.guitoolto be used.
SEE ALSO
- git-diff[1]
-
Show changes between commits, commit and working tree, etc
- git-mergetool[1]
-
Run merge conflict resolution tools to resolve merge conflicts
- git-config[1]
-
Get and set repository or global options
GIT
Part of the git[1] suite
