diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-06 05:05:16 (GMT) |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-14 00:14:05 (GMT) |
| commit | c4b4a5af1604a7546c0b0786e47bcff8a47a6039 (patch) | |
| tree | 31a585ea3f75de124e44ab415316a16857e8b6b7 /Documentation/git-mergetool.txt | |
| parent | 27ebd6e0443bdd795869f598ecebc9eadd64a26c (diff) | |
| download | git-c4b4a5af1604a7546c0b0786e47bcff8a47a6039.zip git-c4b4a5af1604a7546c0b0786e47bcff8a47a6039.tar.gz git-c4b4a5af1604a7546c0b0786e47bcff8a47a6039.tar.bz2 | |
Add git-mergetool to run an appropriate merge conflict resolution program
The git-mergetool program can be used to automatically run an appropriate
merge resolution program to resolve merge conflicts. It will automatically
run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt new file mode 100644 index 0000000..ae69a0e --- /dev/null +++ b/Documentation/git-mergetool.txt @@ -0,0 +1,46 @@ +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, and emerge. + + 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. + +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 + |