mirror of
https://github.com/git/git.git
synced 2024-11-15 15:03:47 +01:00
ff60ffdc05
The quilt series file doesn't have to be located in the same directory with the patches and can be named differently than 'series' as well. This patch adds a commandline option to allow for a non-standard series filename and location. Signed-off-by: Juerg Haefliger <juerg.haefliger@hp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.5 KiB
Plaintext
62 lines
1.5 KiB
Plaintext
git-quiltimport(1)
|
|
==================
|
|
|
|
NAME
|
|
----
|
|
git-quiltimport - Applies a quilt patchset onto the current branch
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
|
|
[--series <file>]
|
|
|
|
|
|
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
|
|
-------
|
|
|
|
-n::
|
|
--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.
|
|
+
|
|
The default for the patch directory is patches
|
|
or the value of the $QUILT_PATCHES environment
|
|
variable.
|
|
|
|
--series <file>::
|
|
The quilt series file.
|
|
+
|
|
The default for the series file is <patches>/series
|
|
or the value of the $QUILT_SERIES environment
|
|
variable.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|