1GIT-MERGETOOL--LI(1) Git Manual GIT-MERGETOOL--LI(1)
2
3
4
6 git-mergetool--lib - Common Git merge tool shell scriptlets
7
9 TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"
10
11
13 This is not a command the end user would want to run. Ever. This
14 documentation is meant for people who are studying the Porcelain-ish
15 scripts and/or are writing new ones.
16
17 The git-mergetool--lib scriptlet is designed to be sourced (using .) by
18 other shell scripts to set up functions for working with Git merge
19 tools.
20
21 Before sourcing git-mergetool--lib, your script must set TOOL_MODE to
22 define the operation mode for the functions listed below. diff and
23 merge are valid values.
24
26 get_merge_tool
27 returns a merge tool.
28
29 get_merge_tool_cmd
30 returns the custom command for a merge tool.
31
32 get_merge_tool_path
33 returns the custom path for a merge tool.
34
35 run_merge_tool
36 launches a merge tool given the tool name and a true/false flag to
37 indicate whether a merge base is present. $MERGED, $LOCAL,
38 $REMOTE, and $BASE must be defined for use by the merge tool.
39
41 Part of the git(1) suite
42
43
44
45Git 2.20.1 12/15/2018 GIT-MERGETOOL--LI(1)