dgit: Abolish url_get in favour of url_fetch

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index f427c2b778fa503d99fedbd3ad11ee26b8093095..a3c2549d3f6757320d34775f0737077e5fe84542 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -647,8 +647,11 @@ Note that this does
 .BR not
 prevent dgit from cleaning your tree, so if the changes in your
 working tree are in the form of untracked files, those might still be
-deleted.  If you want to include untracked files in the build, you can
-use --clean=none in addition to --include-dirty.  Note that this
+deleted, especially with --clean=git.
+If you want to include untracked files in the build, you can
+use --clean=none or --clean=dpkg-source[-d]
+in addition to --include-dirty.
+Note that this
 combination can fail if the untracked files are under
 \fIdebian/patches/\fR.
 .TP
@@ -832,7 +835,7 @@ with as ancestor a patches-applied branch.
 .BR --quilt=auto
 When fixing up source format `3.0 (quilt)' metadata, prefer to
 generate a linear patch stack
-(as with --quilt=auto)
+(as with --quilt=linear)
 but if that doesn't seem possible,
 try to generate a single squashed patch for all the changes made in git
 (as with --quilt=smash).
@@ -862,7 +865,7 @@ Do not check whether 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 " | " -- [ quilt= ] baredebian [ +tarball ]
+.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian [ +git | +tarball ]
 Tell dgit that you are using a nearly-dgit-compatible git branch,
 aka a
 .BR "maintainer view" ,
@@ -895,6 +898,8 @@ that any changes to upstream .gitignore files are represented as
 patches in debian/patches).
 
 .B --quilt=baredebian
+(or its alias
+.BR --quilt=baredebian+git )
 specifies that your HEAD contains only a debian/ directory,
 with any changes to upstream files represented as
 patches in debian/patches.
@@ -1322,6 +1327,12 @@ Force on or off the use of the absurd git-apply emulation
 when running gbp pq import
 when importing a package from a .dsc.
 See Debian bug #841867.
+.TP
+.BR \-\-for\-push
+Override the dgit-distro.distro.readonly configuration setting,
+to specify that we have read/write access
+and should use the corresponding git and achive access approach
+even if the operation is a read-only one.
 .SH CONFIGURATION
 dgit can be configured via the git config system.
 You may set keys with git-config (either in system-global or per-tree
@@ -1466,7 +1477,7 @@ or when pushing and
 .TP
 .BI dgit-distro. distro .git-create " " ssh-cmd | true
 .TP
-.BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR  | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR
+.BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR  | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR " " | " aptget:"
 .TP
 .BR dgit-distro. \fIdistro\fR .archive-query- ( url | tls-key | curl-ca-args )
 .TP