projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| c4b4a5af TT |
1 | git-mergetool(1) |
| 2 | ================ | |
| 3 | ||
| 4 | NAME | |
| 5 | ---- | |
| 6 | git-mergetool - Run merge conflict resolution tools to resolve merge conflicts | |
| 7 | ||
| 8 | SYNOPSIS | |
| 9 | -------- | |
| 10 | 'git-mergetool' [--tool=<tool>] [<file>]... | |
| 11 | ||
| 12 | DESCRIPTION | |
| 13 | ----------- | |
| 14 | ||
| 15 | Use 'git mergetool' to run one of several merge utilities to resolve | |
| 5162e697 | 16 | merge conflicts. It is typically run after linkgit:git-merge[1]. |
| c4b4a5af TT |
17 | |
| 18 | If one or more <file> parameters are given, the merge tool program will | |
| 19 | be run to resolve differences on each file. If no <file> names are | |
| 20 | specified, 'git mergetool' will run the merge tool program on every file | |
| 21 | with merge conflicts. | |
| 22 | ||
| 23 | OPTIONS | |
| 24 | ------- | |
| 25 | -t or --tool=<tool>:: | |
| 26 | Use the merge resolution program specified by <tool>. | |
| 27 | Valid merge tools are: | |
| ca8e6b7a | 28 | kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff |
| e15b484f TT |
29 | + |
| 30 | If a merge resolution program is not specified, 'git mergetool' | |
| 31 | will use the configuration variable merge.tool. If the | |
| 32 | configuration variable merge.tool is not set, 'git mergetool' | |
| 33 | will pick a suitable default. | |
| e3fa2c76 SP |
34 | + |
| 35 | You can explicitly provide a full path to the tool by setting the | |
| 36 | configuration variable mergetool.<tool>.path. For example, you | |
| 37 | can configure the absolute path to kdiff3 by setting | |
| 38 | mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool | |
| 39 | is available in PATH. | |
| c4b4a5af TT |
40 | |
| 41 | Author | |
| 42 | ------ | |
| 43 | Written by Theodore Y Ts'o <tytso@mit.edu> | |
| 44 | ||
| 45 | Documentation | |
| 46 | -------------- | |
| 47 | Documentation by Theodore Y Ts'o. | |
| 48 | ||
| 49 | GIT | |
| 50 | --- | |
| 5162e697 | 51 | Part of the linkgit:git[7] suite |