blob: 001f3bdd01b69e83ab7266ab2396ed8d69f5a7af (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
'\" t
.\" Title: git-quiltimport
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 2024-04-10
.\" Manual: Git Manual
.\" Source: Git 2.44.0.568.g436d4e5b14
.\" Language: English
.\"
.TH "GIT\-QUILTIMPORT" "1" "2024\-04\-10" "Git 2\&.44\&.0\&.568\&.g436d4e" "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>] [\-\-keep\-non\-patch]
.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 \fIAuthor Name <Author Email>\fR
.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
\fIpatches\fR
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
.PP
\-\-keep\-non\-patch
.RS 4
Pass
\fB\-b\fR
flag to
\fIgit mailinfo\fR
(see
\fBgit-mailinfo\fR(1))\&.
.RE
.SH "GIT"
.sp
Part of the \fBgit\fR(1) suite
|
