git-merge-one-file.1   [plain text]

'\" t
.\"     Title: git-merge-one-file
.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\"      Date: 06/01/2011
.\"    Manual: Git Manual
.\"    Source: Git 1.7.5.4
.\"  Language: English
.\"
.TH "GIT\-MERGE\-ONE\-FIL" "1" "06/01/2011" "Git 1\&.7\&.5\&.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-merge-one-file \- The standard helper program to use with git\-merge\-index
.SH "SYNOPSIS"
.sp
\fIgit merge\-one\-file\fR
.SH "DESCRIPTION"
.sp
This is the standard helper program to use with \fIgit merge\-index\fR to resolve a merge after the trivial merge done with \fIgit read\-tree \-m\fR\&.
.SH "GIT"
.sp
Part of the \fBgit\fR(1) suite