summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
blob: ac8969cee5db3136b634658ce2117edf5e84f3ad (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
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 linkgit: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 linkgit:git[7] suite