git-mergetool(1) [suse man page]

GIT-MERGETOOL(1)						    Git Manual							  GIT-MERGETOOL(1)

NAME

       git-mergetool - Run merge conflict resolution tools to resolve merge conflicts

SYNOPSIS

       git mergetool [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]...

DESCRIPTION

       Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge.

       If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file. If no <file> names are
       specified, git mergetool will run the merge tool program on every file with merge conflicts.

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, diffuse, tortoisemerge, opendiff, p4merge and araxis.

	   If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration
	   variable merge.tool is not set, git mergetool 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 mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available in PATH.

	   Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying
	   the command line to invoke in a configuration variable mergetool.<tool>.cmd.

	   When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the
	   configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if
	   available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the
	   name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge
	   tool should write the result of the merge resolution.

	   If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
	   mergetool.<tool>.trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the
	   resolution after the custom tool has exited.

       -y, --no-prompt
	   Don't prompt before each invocation of the merge resolution program.

       --prompt
	   Prompt before each invocation of the merge resolution program. This is the default behaviour; the option is provided to override any
	   configuration settings.

AUTHOR

       Written by Theodore Y Ts'o <tytso@mit.edu[1]>

DOCUMENTATION

       Documentation by Theodore Y Ts'o.

GIT

       Part of the git(1) suite

NOTES

	1. tytso@mit.edu
	   mailto:tytso@mit.edu

Git 1.7.1							    07/05/2010							  GIT-MERGETOOL(1)

GIT-DIFFTOOL(1) 						    Git Manual							   GIT-DIFFTOOL(1)

NAME

       git-difftool - Show changes using common diff tools

SYNOPSIS

       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 git-diff(1).

OPTIONS

       -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 diff tools are: araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
	   kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.

	   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.

       -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 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

       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

Git 1.7.10.4							    11/24/2012							   GIT-DIFFTOOL(1)