diff options
| author |  Steffen Prohaska <prohaska@zib.de> | 2007-10-17 19:16:11 +0200 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:46:24 -0400 |
| commit | e3fa2c761fdc490494e8e0855bcee4d7e58ada6a (patch) | |
| tree | 52702bcd2bee8821a1bb8bc04040efa19acf881c /Documentation/git-diff-tree.txt | |
| parent | Merge branch 'jc/am-quiet' (diff) | |
| download | tgif-e3fa2c761fdc490494e8e0855bcee4d7e58ada6a.tar.xz | |
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-diff-tree.txt')
0 files changed, 0 insertions, 0 deletions