summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorSteffen Prohaska <prohaska@zib.de>2007-10-17 17:16:11 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-18 07:46:24 (GMT)
commite3fa2c761fdc490494e8e0855bcee4d7e58ada6a (patch)
tree52702bcd2bee8821a1bb8bc04040efa19acf881c /Documentation/git-mergetool.txt
parentde61e42b539ffbd28d2a2ba827bb0eb79767057b (diff)
downloadgit-e3fa2c761fdc490494e8e0855bcee4d7e58ada6a.zip
git-e3fa2c761fdc490494e8e0855bcee4d7e58ada6a.tar.gz
git-e3fa2c761fdc490494e8e0855bcee4d7e58ada6a.tar.bz2
mergetool: use path to mergetool in config var mergetool.<tool>.path
This commit adds a mechanism to provide absolute paths to the external programs called by 'git mergetool'. A path can be specified in the configuation variable mergetool.<tool>.path. The configuration variable is similar to how we name branches and remotes. It is extensible if we need to specify more details about a tool. The mechanism is especially useful on Windows, where external programs are unlikely to be in PATH. [sp: Fixed a few minor issues prior to applying] Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-mergetool.txt')
-rw-r--r--Documentation/git-mergetool.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 6c32c6d..78b2f43 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -31,6 +31,12 @@ 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
------