'\" t
.\"     Title: stg-fold
.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\"      Date: 03/26/2014
.\"    Manual: StGit Manual
.\"    Source: StGit
.\"  Language: English
.\"
.TH "STG\-FOLD" "1" "03/26/2014" "StGit" "StGit 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"
stg-fold \- Integrate a GNU diff patch into the current patch
.SH "SYNOPSIS"
.sp
.nf
\fIstg\fR fold [options] [\-\-] [<file>]
.fi
.SH "DESCRIPTION"
Apply the given GNU diff file (or the standard input) onto the top of the current patch\&. With the \fI\-\-threeway\fR option, the patch is applied onto the bottom of the current patch and a three\-way merge is performed with the current top\&. With the \-\-base option, the patch is applied onto the specified base and a three\-way merged is performed with the current top\&.
.SH "OPTIONS"
.PP
\-t, \-\-threeway
.RS 4
Perform a three\-way merge with the current patch\&.
.RE
.PP
\-b BASE, \-\-base BASE
.RS 4
Use BASE instead of HEAD when applying the patch\&.
.RE
.PP
\-p N, \-\-strip N
.RS 4
Remove N leading slashes from diff paths (default 1)\&.
.RE
.PP
\-\-reject
.RS 4
Leave the rejected hunks in corresponding *\&.rej files\&.
.RE
.SH "STGIT"
Part of the StGit suite \- see \fBstg\fR(1)