diff options
author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-mergetool.txt | |
parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-mergetool.txt')
-rw-r--r-- | git-mergetool.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 4a6f7f3a2..55735faf7 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -13,11 +13,11 @@ DESCRIPTION ----------- Use `git mergetool` to run one of several merge utilities to resolve -merge conflicts. It is typically run after 'git-merge'. +merge conflicts. It is typically run after 'git merge'. 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 @@ -29,23 +29,23 @@ OPTIONS kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, tortoisemerge, opendiff, p4merge and araxis. + -If a merge resolution program is not specified, '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' +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 +`mergetool.kdiff3.path`. Otherwise, 'git mergetool' assumes the tool is available in PATH. + Instead of running one of the known merge tool programs, -'git-mergetool' can be customized to run an alternative program +'git mergetool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `mergetool.<tool>.cmd`. + -When 'git-mergetool' is invoked with this tool (either through the +When 'git mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration variable) the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for @@ -59,7 +59,7 @@ merge resolution. If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable `mergetool.<tool>.trustExitCode` can be set to `true`. -Otherwise, 'git-mergetool' will prompt the user to indicate the +Otherwise, 'git mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited. -y:: |