summaryrefslogtreecommitdiff
path: root/dgit.1
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 17:55:55 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 19:50:48 +0000
commite9358173d8338dd0e6f37a6779ac863579d33b6e (patch)
treeb1d6f71efd702120da01ce53f0860bbc29d694b8 /dgit.1
parent4c09c958f20263601483e0150caf4787a064aa5e (diff)
Support dgit --delayed= push
(with a warning in the manpage about possible skew). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit.1')
-rw-r--r--dgit.118
1 files changed, 18 insertions, 0 deletions
diff --git a/dgit.1 b/dgit.1
index 93183cf..4ec02a7 100644
--- a/dgit.1
+++ b/dgit.1
@@ -429,6 +429,24 @@ git history, so that your push is a fast forward from the archive.
implying a split between the dgit view and the
maintainer view, the pseudo-merge will appear only in the dgit view.)
.TP
+.BR --delayed =\fIdays\fR
+Upload to a DELAYED queue.
+
+.B WARNING:
+If the maintainer responds by cancelling
+your upload from the queue,
+and does not make an upload of their own,
+this will not rewind the git branch on the dgit git server.
+Other dgit users will then see your push
+(with a warning message from dgit)
+even though the maintainer wanted to abolish it.
+Such users might unwittingly reintroduce your changes.
+
+If this situation arises,
+someone should make a suitable dgit push
+to update the contents of dgit-repos
+to a version without the controversial changes.
+.TP
.BR --dgit-view-save= \fIbranch\fR|\fIref\fR
Specifies that when a split view quilt mode is in operation,
and dgit calculates