You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.4 KiB
51 lines
1.4 KiB
git-mergetool(1) |
|
================ |
|
|
|
NAME |
|
---- |
|
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts |
|
|
|
SYNOPSIS |
|
-------- |
|
'git-mergetool' [--tool=<tool>] [<file>]... |
|
|
|
DESCRIPTION |
|
----------- |
|
|
|
Use 'git mergetool' to run one of several merge utilities to resolve |
|
merge conflicts. It is typically run after gitlink:git-merge[1]. |
|
|
|
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 or --tool=<tool>:: |
|
Use the merge resolution program specified by <tool>. |
|
Valid merge tools are: |
|
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff |
|
+ |
|
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. |
|
|
|
Author |
|
------ |
|
Written by Theodore Y Ts'o <tytso@mit.edu> |
|
|
|
Documentation |
|
-------------- |
|
Documentation by Theodore Y Ts'o. |
|
|
|
GIT |
|
--- |
|
Part of the gitlink:git[7] suite
|
|
|