dgit: update-vcs-git: Do not crash if url is unchanged

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index cb1cbe218965bfd2c69b983cd5216a5aec8a124f..a7346e50300934e75dd1a1894906f4ab2d776257 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -835,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
 .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).
 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).


@@ -865,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
 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" ,
 Tell dgit that you are using a nearly-dgit-compatible git branch,
 aka a
 .BR "maintainer view" ,


@@ -898,6 +898,8 @@ that any changes to upstream .gitignore files are represented as
 patches in debian/patches).
 
 .B --quilt=baredebian
 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.
 specifies that your HEAD contains only a debian/ directory,
 with any changes to upstream files represented as
 patches in debian/patches.


@@ -1325,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.
 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
 .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


@@ -1469,7 +1477,7 @@ or when pushing and
 .TP
 .BI dgit-distro. distro .git-create " " ssh-cmd | true
 .TP
 .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
 .TP
 .BR dgit-distro. \fIdistro\fR .archive-query- ( url | tls-key | curl-ca-args )
 .TP


@@ -1517,7 +1525,7 @@ also the \-\-ssh= and \-\-ssh: options.
 Default git user.email and user.name for new trees.  See
 .BR "dgit setup-new-tree" .
 .TP
 Default git user.email and user.name for new trees.  See
 .BR "dgit setup-new-tree" .
 .TP

-.BR gpg ", " dpkg- "..., " debsign ", " git ", " curl ", " dput ", " LWP::UserAgent
+.BR gpg ", " dpkg- "..., " debsign ", " git ", [" lib ] curl ", " dput

 and other subprograms and modules used by dgit are affected by various
 environment variables.  Consult the documentation for those programs
 for details.
 and other subprograms and modules used by dgit are affected by various
 environment variables.  Consult the documentation for those programs
 for details.