]>
Commit | Line | Data |
---|---|---|
d3d8f361 | 1 | git-quiltimport(1) |
c9a5172f | 2 | ================== |
d3d8f361 EB |
3 | |
4 | NAME | |
5 | ---- | |
6 | git-quiltimport - Applies a quilt patchset onto the current branch | |
7 | ||
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
11 | [verse] | |
1cdd64e8 | 12 | 'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>] |
1eadaa39 | 13 | [--series <file>] [--keep-non-patch] |
d3d8f361 EB |
14 | |
15 | ||
16 | DESCRIPTION | |
17 | ----------- | |
2de9b711 | 18 | Applies a quilt patchset onto the current Git branch, preserving |
d3d8f361 EB |
19 | the patch boundaries, patch order, and patch descriptions present |
20 | in the quilt patchset. | |
21 | ||
22 | For each patch the code attempts to extract the author from the | |
23 | patch description. If that fails it falls back to the author | |
24 | specified with --author. If the --author flag was not given | |
25 | the patch description is displayed and the user is asked to | |
26 | interactively enter the author of the patch. | |
27 | ||
28 | If a subject is not found in the patch description the patch name is | |
2de9b711 | 29 | preserved as the 1 line subject in the Git description. |
d3d8f361 EB |
30 | |
31 | OPTIONS | |
32 | ------- | |
459cf2e9 SB |
33 | |
34 | -n:: | |
d3bd4ee1 EB |
35 | --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 | ||
d3d8f361 EB |
41 | --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>:: | |
ff60ffdc | 46 | The directory to find the quilt patches. |
d53ebb42 SV |
47 | + |
48 | The default for the patch directory is patches | |
47d81b5c | 49 | or the value of the `$QUILT_PATCHES` environment |
d53ebb42 | 50 | variable. |
d3d8f361 | 51 | |
ff60ffdc JH |
52 | --series <file>:: |
53 | The quilt series file. | |
54 | + | |
55 | The default for the series file is <patches>/series | |
47d81b5c | 56 | or the value of the `$QUILT_SERIES` environment |
ff60ffdc JH |
57 | variable. |
58 | ||
1eadaa39 LA |
59 | --keep-non-patch:: |
60 | Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). | |
61 | ||
d3d8f361 EB |
62 | GIT |
63 | --- | |
9e1f0a85 | 64 | Part of the linkgit:git[1] suite |