Documentation / git-quiltimport.txton commit rebase docs: drop stray word in merge command description (57e9dca)
   1git-quiltimport(1)
   2==================
   3
   4NAME
   5----
   6git-quiltimport - Applies a quilt patchset onto the current branch
   7
   8
   9SYNOPSIS
  10--------
  11[verse]
  12'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
  13                [--series <file>]
  14
  15
  16DESCRIPTION
  17-----------
  18Applies a quilt patchset onto the current Git branch, preserving
  19the patch boundaries, patch order, and patch descriptions present
  20in the quilt patchset.
  21
  22For each patch the code attempts to extract the author from the
  23patch description.  If that fails it falls back to the author
  24specified with --author.  If the --author flag was not given
  25the patch description is displayed and the user is asked to
  26interactively enter the author of the patch.
  27
  28If a subject is not found in the patch description the patch name is
  29preserved as the 1 line subject in the Git description.
  30
  31OPTIONS
  32-------
  33
  34-n::
  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>::
  46        The directory to find the quilt patches.
  47+
  48The default for the patch directory is patches
  49or the value of the `$QUILT_PATCHES` environment
  50variable.
  51
  52--series <file>::
  53        The quilt series file.
  54+
  55The default for the series file is <patches>/series
  56or the value of the `$QUILT_SERIES` environment
  57variable.
  58
  59GIT
  60---
  61Part of the linkgit:git[1] suite