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. the return code is 1 if we returned a guessed
27           merge tool, else 0.  $GIT_MERGETOOL_GUI may be set to true to
28           search for the appropriate guitool.
29
30       get_merge_tool_cmd
31           returns the custom command for a merge tool.
32
33       get_merge_tool_path
34           returns the custom path for a merge tool.
35
36       run_merge_tool
37           launches a merge tool given the tool name and a true/false flag to
38           indicate whether a merge base is present.  $MERGED, $LOCAL,
39           $REMOTE, and $BASE must be defined for use by the merge tool.
40

GIT

42       Part of the git(1) suite
43
44
45
46Git 2.26.2                        2020-04-20              GIT-MERGETOOL--LI(1)
Impressum