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.79.1 <http://docbook.sf.net/>
.\"      Date: 02/24/2019
.\"    Manual: Git Manual
.\"    Source: Git 2.21.0
.\"  Language: English
.\"
.TH "GIT\-MERGE\-ONE\-FIL" "1" "02/24/2019" "Git 2\&.21\&.0" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el       .ds Aq '
.\" -----------------------------------------------------------------
.\" * 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
.nf
\fIgit merge\-one\-file\fR
.fi
.sp
.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