summaryrefslogtreecommitdiff
path: root/Documentation/git-quiltimport.txt
blob: 6e9a8c369a38e85c003c451b414fd58c24445aba (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
git-quiltimport(1)
================

NAME
----
git-quiltimport - Applies a quilt patchset onto the current branch


SYNOPSIS
--------
[verse]
'git-quiltimport' [--dry-run] [--author <author>] [--patches <dir>]


DESCRIPTION
-----------
Applies a quilt patchset onto the current git branch, preserving
the patch boundaries, patch order, and patch descriptions present
in the quilt patchset.

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.

If a subject is not found in the patch description the patch name is
preserved as the 1 line subject in the git description.

OPTIONS
-------
--dry-run::
	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.

--author Author Name <Author Email>::
	The author name and email address to use when no author
	information can be found in the patch description.

--patches <dir>::
	The directory to find the quilt patches and the
	quilt series file.

        The default for the patch directory is patches
	or the value of the $QUILT_PATCHES environment
	variable.

Author
------
Written by Eric Biederman <ebiederm@lnxi.com>

Documentation
--------------
Documentation by Eric Biederman <ebiederm@lnxi.com>

GIT
---
Part of the gitlink:git[7] suite