1GIT-MERGETOOL--LI(1)              Git Manual              GIT-MERGETOOL--LI(1)
2
3
4

NAME

6       git-mergetool--lib - Common git merge tool shell scriptlets
7

SYNOPSIS

9       TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool—lib"
10

DESCRIPTION

12       This is not a command the end user would want to run. Ever. This
13       documentation is meant for people who are studying the Porcelain-ish
14       scripts and/or are writing new ones.
15
16       The git-mergetool--lib scriptlet is designed to be sourced (using .) by
17       other shell scripts to set up functions for working with git merge
18       tools.
19
20       Before sourcing git-mergetool--lib, your script must set TOOL_MODE to
21       define the operation mode for the functions listed below. diff and
22       merge are valid values.
23

FUNCTIONS

25       get_merge_tool
26           returns a merge tool.
27
28       get_merge_tool_cmd
29           returns the custom command for a merge tool.
30
31       get_merge_tool_path
32           returns the custom path for a merge tool.
33
34       run_merge_tool
35           launches a merge tool given the tool name and a true/false flag to
36           indicate whether a merge base is present.  $MERGED, $LOCAL,
37           $REMOTE, and $BASE must be defined for use by the merge tool.
38

AUTHOR

40       Written by David Aguilar <davvid@gmail.com[1]>
41

DOCUMENTATION

43       Documentation by David Aguilar and the git-list
44       <git@vger.kernel.org[2]>.
45

GIT

47       Part of the git(1) suite
48

NOTES

50        1. davvid@gmail.com
51           mailto:davvid@gmail.com
52
53        2. git@vger.kernel.org
54           mailto:git@vger.kernel.org
55
56
57
58Git 1.7.4.4                       04/11/2011              GIT-MERGETOOL--LI(1)
Impressum