mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
7791a1d9b9
The SYNOPSIS sections of most commands that span several lines already use [verse] to retain line breaks. Most commands that don't span several lines seem not to use [verse]. In the HTML output, [verse] does not only preserve line breaks, but also makes the section indented, which causes a slight inconsistency between commands that use [verse] and those that don't. Use [verse] in all SYNOPSIS sections for consistency. Also remove the blank lines from git-fetch.txt and git-rebase.txt to align with the other man pages. In the case of git-rebase.txt, which already uses [verse], the blank line makes the [verse] not apply to the last line, so removing the blank line also makes the formatting within the document more consistent. While at it, add single quotes to 'git cvsimport' for consistency with other commands. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
89 lines
3.1 KiB
Plaintext
89 lines
3.1 KiB
Plaintext
git-mergetool(1)
|
|
================
|
|
|
|
NAME
|
|
----
|
|
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
'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:
|
|
araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
|
|
meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
|
|
+
|
|
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.
|
|
|
|
TEMPORARY FILES
|
|
---------------
|
|
`git mergetool` creates `*.orig` backup files while resolving merges.
|
|
These are safe to remove once a file has been merged and its
|
|
`git mergetool` session has completed.
|
|
|
|
Setting the `mergetool.keepBackup` configuration variable to `false`
|
|
causes `git mergetool` to automatically remove the backup as files
|
|
are successfully merged.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|