diff options
author | Juerg Haefliger <juerg.haefliger@hp.com> | 2015-08-31 14:06:38 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-09-01 11:10:07 -0700 |
commit | ff60ffdc05fe8e2d26c488ab18c66b7fa746fcc6 (patch) | |
tree | 4970ee64a2db0a66a9c3ae117b43989ca50de84d /Documentation/git-quiltimport.txt | |
parent | b260d265e189728b26e50506ac6ffab6a7d588da (diff) | |
download | git-ff60ffdc05fe8e2d26c488ab18c66b7fa746fcc6.tar.gz |
git-quiltimport: add commandline option --series <file>jh/quiltimport-explicit-series-file
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>
Diffstat (limited to 'Documentation/git-quiltimport.txt')
-rw-r--r-- | Documentation/git-quiltimport.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt index d64388cb8e..ff633b0db7 100644 --- a/Documentation/git-quiltimport.txt +++ b/Documentation/git-quiltimport.txt @@ -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 |