Home Explore Blog CI



git

1st chunk of `Documentation/config/mergetool.adoc`
9b455e3045806c1cc9cd48e040d1dd0a11cad256205eb6830000000100000972
`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.  The
	specified command is evaluated in shell with the following
	variables available: `BASE` is the name of a temporary file
	containing the common base of the files to be merged, if available;
	`LOCAL` is the name of a temporary file containing the contents of
	the file on the current branch; `REMOTE` is the name of a temporary
	file containing the contents of the file from the branch being
	merged; `MERGED` contains the name of the file to which the merge
	tool should write the results of a successful merge.

`mergetool.<tool>.hideResolved`::
	Allows the user to override the global `mergetool.hideResolved` value
	for a specific tool. See `mergetool.hideResolved` for the full
	description.

`mergetool.<tool>.trustExitCode`::
	For a custom merge command, specify whether the exit code of
	the merge command can be used to determine whether the merge was
	successful.  If this is not set to true then the merge target file
	timestamp is checked, and the merge is assumed to have been successful
	if the file has been updated; otherwise, the user is prompted to
	indicate the success of the merge.

`mergetool.meld.hasOutput`::
	Older versions of `meld` do not support the `--output` option.
	Git will attempt to detect whether `meld` supports `--output`
	by inspecting the output of `meld --help`.  Configuring
	`mergetool.meld.hasOutput` will make Git skip these checks and
	use the configured value instead.  Setting `mergetool.meld.hasOutput`
	to `true` tells Git to unconditionally use the `--output` option,
	and `false` avoids using `--output`.

`mergetool.meld.useAutoMerge`::
	When the `--auto-merge` is given, meld will merge all non-conflicting
	parts automatically, highlight the conflicting parts, and wait for
	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
	Git to unconditionally use the `--auto-merge` option with `meld`.
	Setting this value to `auto` makes git detect whether `--auto-merge`
	is supported and will only use `--auto-merge` when available.  A
	value of `false` avoids using `--auto-merge` altogether, and is the
	default value.

`mergetool.<variant>.layout`::
	Configure the split window layout for vimdiff's _<variant>_, which is any of `vimdiff`,

Title: Merge Tool Configuration Options
Summary
This section describes configuration options for merge tools, including overriding tool paths, specifying commands, and customizing behavior for specific tools like meld and vimdiff, allowing for greater control over the merge process and improved integration with various merge tools.