table of contents
other versions
- jessie 1:2.1.4-2.1+deb8u6
- jessie-backports 1:2.11.0-3~bpo8+1
- stretch 1:2.11.0-3+deb9u4
- testing 1:2.20.1-2
- stretch-backports 1:2.20.1-1~bpo9+1
- unstable 1:2.20.1-2
- experimental 1:2.21.0+next.20190320-1
GIT-MERGETOOL--LI(1) | Git Manual | GIT-MERGETOOL--LI(1) |
NAME¶
git-mergetool--lib - Common Git merge tool shell scriptletsSYNOPSIS¶
TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"
DESCRIPTION¶
This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones. The git-mergetool--lib scriptlet is designed to be sourced (using .) by other shell scripts to set up functions for working with Git merge tools. Before sourcing git-mergetool--lib, your script must set TOOL_MODE to define the operation mode for the functions listed below. diff and merge are valid values.FUNCTIONS¶
get_merge_toolreturns a merge tool.
get_merge_tool_cmd
returns the custom command for a merge tool.
get_merge_tool_path
returns the custom path for a merge tool.
run_merge_tool
launches a merge tool given the tool name and a
true/false flag to indicate whether a merge base is present. $MERGED,
$LOCAL, $REMOTE, and $BASE must be defined for use by the
merge tool.
GIT¶
Part of the git(1) suite05/28/2018 | Git 2.1.4 |