blob: 70562dc4c0235d53501bab56ff98af6169b8f968 [file] [log] [blame]
Junio C Hamano9bf8a512006-05-20 02:24:441git-quiltimport(1)
Junio C Hamano4c43d652014-10-20 21:14:292==================
Junio C Hamano9bf8a512006-05-20 02:24:443
4NAME
5----
6git-quiltimport - Applies a quilt patchset onto the current branch
7
8
9SYNOPSIS
10--------
11[verse]
Junio C Hamano7df6dcf2009-09-13 09:51:1712'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
Junio C Hamanoace33e42019-01-18 23:16:0513[--series <file>] [--keep-non-patch]
Junio C Hamano9bf8a512006-05-20 02:24:4414
15
16DESCRIPTION
17-----------
Junio C Hamano076ffcc2013-02-06 05:13:2118Applies a quilt patchset onto the current Git branch, preserving
Junio C Hamano9bf8a512006-05-20 02:24:4419the 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
Junio C Hamano076ffcc2013-02-06 05:13:2129preserved as the 1 line subject in the Git description.
Junio C Hamano9bf8a512006-05-20 02:24:4430
31OPTIONS
32-------
Junio C Hamanoeb415992008-06-08 22:49:4733
34-n::
Junio C Hamano9bf8a512006-05-20 02:24:4435--dry-run::
36Walk through the patches in the series and warn
37if we cannot find all of the necessary information to commit
38a patch. At the time of this writing only missing author
39information is warned about.
40
41--author Author Name <Author Email>::
42The author name and email address to use when no author
43information can be found in the patch description.
44
45--patches <dir>::
Junio C Hamano1eb56092015-10-05 20:39:5346The directory to find the quilt patches.
Junio C Hamanoa3fd83c2007-03-02 10:34:3647+
48The default for the patch directory is patches
Junio C Hamano042f2142016-06-27 18:05:0549or the value of the `$QUILT_PATCHES` environment
Junio C Hamanoa3fd83c2007-03-02 10:34:3650variable.
Junio C Hamano9bf8a512006-05-20 02:24:4451
Junio C Hamano1eb56092015-10-05 20:39:5352--series <file>::
53The quilt series file.
54+
55The default for the series file is <patches>/series
Junio C Hamano042f2142016-06-27 18:05:0556or the value of the `$QUILT_SERIES` environment
Junio C Hamano1eb56092015-10-05 20:39:5357variable.
58
Junio C Hamanoace33e42019-01-18 23:16:0559--keep-non-patch::
60Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
61
Junio C Hamano9bf8a512006-05-20 02:24:4462GIT
63---
Junio C Hamanof7c042d2008-06-06 22:50:5364Part of the linkgit:git[1] suite