54 lines
2.4 KiB
Text
54 lines
2.4 KiB
Text
|
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>.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 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.keepBackup::
|
||
|
|
After performing a merge, the original file with conflict markers
|
||
|
|
can be saved as a file with a `.orig` extension. If this variable
|
||
|
|
is set to `false` then this file is not preserved. Defaults to
|
||
|
|
`true` (i.e. keep the backup files).
|
||
|
|
|
||
|
|
mergetool.keepTemporaries::
|
||
|
|
When invoking a custom merge tool, Git uses a set of temporary
|
||
|
|
files to pass to the tool. If the tool returns an error and this
|
||
|
|
variable is set to `true`, then these temporary files will be
|
||
|
|
preserved, otherwise they will be removed after the tool has
|
||
|
|
exited. Defaults to `false`.
|
||
|
|
|
||
|
|
mergetool.writeToTemp::
|
||
|
|
Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of
|
||
|
|
conflicting files in the worktree by default. Git will attempt
|
||
|
|
to use a temporary directory for these files when set `true`.
|
||
|
|
Defaults to `false`.
|
||
|
|
|
||
|
|
mergetool.prompt::
|
||
|
|
Prompt before each invocation of the merge resolution program.
|