git-mergetool--lib
(1)
Name
git-mergetool--lib - Common git merge tool shell scriptlets
Synopsis
TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"
Description
Git Manual GIT-MERGETOOL--LI(1)
NAME
git-mergetool--lib - Common git merge tool shell scriptlets
SYNOPSIS
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_tool
returns 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) suite
ATTRIBUTES
See attributes(5) for descriptions of the following
attributes:
+---------------+--------------------------+
|ATTRIBUTE TYPE | ATTRIBUTE VALUE |
+---------------+--------------------------+
|Availability | developer/versioning/git |
+---------------+--------------------------+
|Stability | Uncommitted |
+---------------+--------------------------+
Git 1.7.9.2 Last change: 02/22/2012 1
Git Manual GIT-MERGETOOL--LI(1)
NOTES
This software was built from source available at
https://java.net/projects/solaris-userland. The original
community source was downloaded from http://git-
core.googlecode.com/files/git-1.7.9.2.tar.gz
Further information about this software can be found on the
open source community website at http://git-scm.com/.
Git 1.7.9.2 Last change: 02/22/2012 2