summaryrefslogtreecommitdiff
path: root/dgit.1
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-23 13:02:59 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-23 13:03:02 +0100
commitdc2d5ffb3627335e6522ddb7bf526880dc699762 (patch)
tree5b20c0ce29d15b3d6618fe1f7e7bd4ca5490f6ba /dgit.1
parente2a26e6964e16478866a7503cb50f0f45ab8898e (diff)
Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit.1')
-rw-r--r--dgit.110
1 files changed, 7 insertions, 3 deletions
diff --git a/dgit.1 b/dgit.1
index cd2075f..99ae90b 100644
--- a/dgit.1
+++ b/dgit.1
@@ -445,20 +445,24 @@ Do not check whether up source format `3.0 (quilt)' metadata needs
fixing up. If you use this option and the metadata did in fact need
fixing up, dgit push will fail.
.TP
-.BR --quilt=gbp " | " --quilt=dpm " | " --quilt=unapplied
+.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied
Tell dgit that you are using a nearly-dgit-compatible git branch,
aka a
.BR "maintainer view" ,
and
do not want your branch changed by dgit.
-.B --quilt=gbp
+.B --gbp
+(short for
+.BR --quilt=gbp )
is for use with git-buildpackage.
Your HEAD is expected to be
a patches-unapplied git branch, except that it might contain changes
to upstream .gitignore files. This is the default for dgit gbp-build.
-.B --quilt=dpm
+.B --dpm
+(short for
+.BR --quilt=dpm )
is for use with git-dpm.
Your HEAD is expected to be
a patches-applied git branch,