diff options
| author | Charles Bailey <charles@hashpling.org> | 2008-03-08 20:46:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 13:22:55 -0800 |
| commit | bbdfbc4b01b38489a0c171bc70c89e017c759cdc (patch) | |
| tree | efd6abb9e72e0551d4a88b40837266d31d37750d /Documentation/git-mergetool.txt | |
| parent | 5c9afcff1aa048abf95296231d51fa481304a735 (diff) | |
| download | git-bbdfbc4b01b38489a0c171bc70c89e017c759cdc.tar.gz git-bbdfbc4b01b38489a0c171bc70c89e017c759cdc.tar.xz | |
git-mergetool documentaiton: show toolnames in typewriter font
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 50f106ec5..ac8969cee 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -12,12 +12,12 @@ SYNOPSIS DESCRIPTION ----------- -Use 'git mergetool' to run one of several merge utilities to resolve +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 +specified, `git mergetool` will run the merge tool program on every file with merge conflicts. OPTIONS @@ -27,16 +27,16 @@ OPTIONS 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' +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 +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. +`mergetool.kdiff3.path`. Otherwise, `git mergetool` assumes the +tool is available in PATH. Author ------ |