]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - Documentation/git-mergetool--lib.txt
worktree: fix worktree add race
[thirdparty/git.git] / Documentation / git-mergetool--lib.txt
... / ...
CommitLineData
1git-mergetool{litdd}lib(1)
2==========================
3
4NAME
5----
6git-mergetool--lib - Common Git merge tool shell scriptlets
7
8SYNOPSIS
9--------
10[verse]
11'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
12
13DESCRIPTION
14-----------
15
16This is not a command the end user would want to run. Ever.
17This documentation is meant for people who are studying the
18Porcelain-ish scripts and/or are writing new ones.
19
20The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using
21`.`) by other shell scripts to set up functions for working
22with Git merge tools.
23
24Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE`
25to define the operation mode for the functions listed below.
26'diff' and 'merge' are valid values.
27
28FUNCTIONS
29---------
30get_merge_tool::
31 returns a merge tool.
32
33get_merge_tool_cmd::
34 returns the custom command for a merge tool.
35
36get_merge_tool_path::
37 returns the custom path for a merge tool.
38
39run_merge_tool::
40 launches a merge tool given the tool name and a true/false
41 flag to indicate whether a merge base is present.
42 '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
43 for use by the merge tool.
44
45GIT
46---
47Part of the linkgit:git[1] suite