git-debrebase: Set $|

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index e7ab454adc1c71fb4b381a5a4b9d3e25558d702f..67aa2fab65c2785091ae5847dfb110225f03d2b0 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -227,9 +227,6 @@ dgit push always uses the package, suite and version specified in the
 debian/changelog and the .dsc, which must agree.  If the command line
 specifies a suite then that must match too.
 
-With \fB-C\fR, performs a dgit push, additionally ensuring that no
-binary packages are uploaded.
-
 When used on a git-debrebase branch,
 dgit calls git-debrebase
 to prepare the branch
@@ -239,6 +236,9 @@ for source package upload and push.
 Without \fB-C\fR, builds a source package and dgit pushes it.  Saying
 \fBdgit push-source\fR is like saying "update the source code in the
 archive to match my git HEAD, and let the autobuilders do the rest."
+
+With \fB-C\fR, performs a dgit push, additionally ensuring that no
+binary packages are uploaded.
 .TP
 \fBdgit rpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR [\fIpush args...\fR]
 Pushes the contents of the specified directory on a remote machine.
@@ -1050,6 +1050,17 @@ The result is a fresh import,
 discarding the git history
 that the person who pushed that .dsc was working with.
 .TP
+.B --force-uploading-binaries
+Carry on and
+upload binaries
+even though dgit thinks your distro does not permit that.
+.TP
+.B --force-uploading-source-only
+Carry on and do a source-only upload,
+without any binaries,
+even though dgit thinks your distro does not permit that,
+or does not permit that in this situation.
+.TP
 .B --force-unrepresentable
 Carry on even if
 dgit thinks that your git tree contains changes
@@ -1226,6 +1237,8 @@ or when pushing and
 .TP
 .BI dgit-distro. distro .rewrite-map-enable
 .TP
+.BR dgit-distro. \fIdistro\fR .source-only-uploads " " ok | always | never | not-wholly-new
+.TP
 .BI dgit.default.old-dsc-distro
 .TP
 .BI dgit.dsc-url-proto-ok. protocol