git-mergetool--lib.1   [plain text]

'\" t
.\"     Title: git-mergetool--lib
.\"    Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\"      Date: 04/06/2011
.\"    Manual: Git Manual
.\"    Source: Git 1.7.4.4
.\"  Language: English
.\"
.TH "GIT\-MERGETOOL\-\-LI" "1" "04/06/2011" "Git 1\&.7\&.4\&.4" "Git Manual"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
git-mergetool--lib \- Common git merge tool shell scriptlets
.SH "SYNOPSIS"
.sp
\fITOOL_MODE=(diff|merge) \&. "$(git \-\-exec\-path)/git\-mergetool\(emlib"\fR
.SH "DESCRIPTION"
.sp
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\&.
.sp
The \fIgit\-mergetool\-\-lib\fR scriptlet is designed to be sourced (using \&.) by other shell scripts to set up functions for working with git merge tools\&.
.sp
Before sourcing \fIgit\-mergetool\-\-lib\fR, your script must set TOOL_MODE to define the operation mode for the functions listed below\&. \fIdiff\fR and \fImerge\fR are valid values\&.
.SH "FUNCTIONS"
.PP
get_merge_tool
.RS 4
returns a merge tool\&.
.RE
.PP
get_merge_tool_cmd
.RS 4
returns the custom command for a merge tool\&.
.RE
.PP
get_merge_tool_path
.RS 4
returns the custom path for a merge tool\&.
.RE
.PP
run_merge_tool
.RS 4
launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present\&.
\fI$MERGED\fR,
\fI$LOCAL\fR,
\fI$REMOTE\fR, and
\fI$BASE\fR
must be defined for use by the merge tool\&.
.RE
.SH "AUTHOR"
.sp
Written by David Aguilar <\m[blue]\fBdavvid@gmail\&.com\fR\m[]\&\s-2\u[1]\d\s+2>
.SH "DOCUMENTATION"
.sp
Documentation by David Aguilar and the git\-list <\m[blue]\fBgit@vger\&.kernel\&.org\fR\m[]\&\s-2\u[2]\d\s+2>\&.
.SH "GIT"
.sp
Part of the \fBgit\fR(1) suite
.SH "NOTES"
.IP " 1." 4
davvid@gmail.com
.RS 4
\%mailto:davvid@gmail.com
.RE
.IP " 2." 4
git@vger.kernel.org
.RS 4
\%mailto:git@vger.kernel.org
.RE