blob: 8cf952b4de669ea3e7275c5d10087005548574eb [file] [log] [blame]
Eric W. Biedermand3d8f362006-05-17 12:44:40 -06001git-quiltimport(1)
brian m. carlsonc9a51722014-10-11 23:37:33 +00002==================
Eric W. Biedermand3d8f362006-05-17 12:44:40 -06003
4NAME
5----
6git-quiltimport - Applies a quilt patchset onto the current branch
7
8
9SYNOPSIS
10--------
11[verse]
Junio C Hamano1cdd64e2009-09-12 19:40:27 -070012'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
Juerg Haefligerff60ffd2015-08-31 14:06:38 +020013 [--series <file>]
Eric W. Biedermand3d8f362006-05-17 12:44:40 -060014
15
16DESCRIPTION
17-----------
Thomas Ackermann2de9b712013-01-21 20:17:53 +010018Applies a quilt patchset onto the current Git branch, preserving
Eric W. Biedermand3d8f362006-05-17 12:44:40 -060019the patch boundaries, patch order, and patch descriptions present
20in the quilt patchset.
21
22For each patch the code attempts to extract the author from the
23patch description. If that fails it falls back to the author
24specified with --author. If the --author flag was not given
25the patch description is displayed and the user is asked to
26interactively enter the author of the patch.
27
28If a subject is not found in the patch description the patch name is
Thomas Ackermann2de9b712013-01-21 20:17:53 +010029preserved as the 1 line subject in the Git description.
Eric W. Biedermand3d8f362006-05-17 12:44:40 -060030
31OPTIONS
32-------
Stephan Beyer459cf2e2008-06-08 03:36:10 +020033
34-n::
Eric W. Biedermand3bd4ee2006-05-17 14:10:25 -060035--dry-run::
36 Walk through the patches in the series and warn
37 if we cannot find all of the necessary information to commit
38 a patch. At the time of this writing only missing author
39 information is warned about.
40
Eric W. Biedermand3d8f362006-05-17 12:44:40 -060041--author Author Name <Author Email>::
42 The author name and email address to use when no author
43 information can be found in the patch description.
44
45--patches <dir>::
Juerg Haefligerff60ffd2015-08-31 14:06:38 +020046 The directory to find the quilt patches.
Sergey Vlasovd53ebb42007-03-01 22:41:15 +030047+
48The default for the patch directory is patches
Tom Russello47d81b52016-06-08 00:35:07 +020049or the value of the `$QUILT_PATCHES` environment
Sergey Vlasovd53ebb42007-03-01 22:41:15 +030050variable.
Eric W. Biedermand3d8f362006-05-17 12:44:40 -060051
Juerg Haefligerff60ffd2015-08-31 14:06:38 +020052--series <file>::
53 The quilt series file.
54+
55The default for the series file is <patches>/series
Tom Russello47d81b52016-06-08 00:35:07 +020056or the value of the `$QUILT_SERIES` environment
Juerg Haefligerff60ffd2015-08-31 14:06:38 +020057variable.
58
Eric W. Biedermand3d8f362006-05-17 12:44:40 -060059GIT
60---
Christian Couder9e1f0a82008-06-06 09:07:32 +020061Part of the linkgit:git[1] suite