blob: 98d87de2cfda7267ca57a397a880edc44f599931 [file] [log] [blame]
'\" t
.\" Title: git-quiltimport
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 11/18/2018
.\" Manual: Git Manual
.\" Source: Git 2.20.0.rc0
.\" Language: English
.\"
.TH "GIT\-QUILTIMPORT" "1" "11/18/2018" "Git 2\&.20\&.0\&.rc0" "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-quiltimport \- Applies a quilt patchset onto the current branch
.SH "SYNOPSIS"
.sp
.nf
\fIgit quiltimport\fR [\-\-dry\-run | \-n] [\-\-author <author>] [\-\-patches <dir>]
[\-\-series <file>]
.fi
.sp
.SH "DESCRIPTION"
.sp
Applies a quilt patchset onto the current Git branch, preserving the patch boundaries, patch order, and patch descriptions present in the quilt patchset\&.
.sp
For each patch the code attempts to extract the author from the patch description\&. If that fails it falls back to the author specified with \-\-author\&. If the \-\-author flag was not given the patch description is displayed and the user is asked to interactively enter the author of the patch\&.
.sp
If a subject is not found in the patch description the patch name is preserved as the 1 line subject in the Git description\&.
.SH "OPTIONS"
.PP
\-n, \-\-dry\-run
.RS 4
Walk through the patches in the series and warn if we cannot find all of the necessary information to commit a patch\&. At the time of this writing only missing author information is warned about\&.
.RE
.PP
\-\-author Author Name <Author Email>
.RS 4
The author name and email address to use when no author information can be found in the patch description\&.
.RE
.PP
\-\-patches <dir>
.RS 4
The directory to find the quilt patches\&.
.sp
The default for the patch directory is patches or the value of the
\fB$QUILT_PATCHES\fR
environment variable\&.
.RE
.PP
\-\-series <file>
.RS 4
The quilt series file\&.
.sp
The default for the series file is <patches>/series or the value of the
\fB$QUILT_SERIES\fR
environment variable\&.
.RE
.SH "GIT"
.sp
Part of the \fBgit\fR(1) suite