| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 1 | git-quiltimport(1) |
| Junio C Hamano | 4c43d65 | 2014-10-20 21:14:29 | [diff] [blame] | 2 | ================== |
| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | git-quiltimport - Applies a quilt patchset onto the current branch |
| 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| 11 | [verse] |
| Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 12 | 'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>] |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 13 | [--series <file>] |
| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 14 | |
| 15 | |
| 16 | DESCRIPTION |
| 17 | ----------- |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 18 | Applies a quilt patchset onto the current Git branch, preserving |
| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 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 |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 29 | preserved as the 1 line subject in the Git description. |
| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 30 | |
| 31 | OPTIONS |
| 32 | ------- |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 33 | |
| 34 | -n:: |
| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 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 | |
| 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>:: |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 46 | The directory to find the quilt patches. |
| Junio C Hamano | a3fd83c | 2007-03-02 10:34:36 | [diff] [blame] | 47 | + |
| 48 | The default for the patch directory is patches |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 49 | or the value of the `$QUILT_PATCHES` environment |
| Junio C Hamano | a3fd83c | 2007-03-02 10:34:36 | [diff] [blame] | 50 | variable. |
| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 51 | |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 52 | --series <file>:: |
| 53 | The quilt series file. |
| 54 | + |
| 55 | The default for the series file is <patches>/series |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 56 | or the value of the `$QUILT_SERIES` environment |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 57 | variable. |
| 58 | |
| Junio C Hamano | 9bf8a51 | 2006-05-20 02:24:44 | [diff] [blame] | 59 | GIT |
| 60 | --- |
| Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 61 | Part of the linkgit:git[1] suite |
