Staging
v0.5.1
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC
"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.
source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de>

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
2 parent s 50b2d72 + 6327f0e
Raw File
git-quiltimport.txt
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>] [--keep-non-patch]


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.

--keep-non-patch::
	Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).

GIT
---
Part of the linkgit:git[1] suite
back to top