mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
a6080a0a44
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
1.5 KiB
Text
60 lines
1.5 KiB
Text
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
|