Merge branch 'jh/quiltimport-explicit-series-file'

"quiltimport" allows to specify the series file by honoring the
$QUILT_SERIES environment and also --series command line option.

* jh/quiltimport-explicit-series-file:
  git-quiltimport: add commandline option --series <file>
This commit is contained in:
Junio C Hamano
2015-10-05 12:30:08 -07:00
2 changed files with 23 additions and 4 deletions

View File

@ -10,6 +10,7 @@ SYNOPSIS
--------
[verse]
'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
[--series <file>]
DESCRIPTION
@ -42,13 +43,19 @@ OPTIONS
information can be found in the patch description.
--patches <dir>::
The directory to find the quilt patches and the
quilt series file.
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