X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-nmu-simple.7.pod;h=3ebc68a420ebebec62d084946c4549a7931d299e;hp=d4b285a3182e71878ff771a4c68742b202d1ff81;hb=862997ec70c49b644de04639f6f68bc8309e3d56;hpb=256b64652ad59ecf74a75fb3337e39dfec8773f4

diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod
index d4b285a3..3ebc68a4 100644
--- a/dgit-nmu-simple.7.pod
+++ b/dgit-nmu-simple.7.pod
@@ -32,10 +32,6 @@ git practices are
 and 
 consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
 
-Further,
-note that dgit cannot yet be used
-to upload to the DELAYED queues.
-
 =head1 SUMMARY
 
 =over 4
@@ -50,7 +46,7 @@ to upload to the DELAYED queues.
     % dch -r && git add debian/changelog && git commit -m"Finalise NMU"
     % dgit -wgf sbuild -A -c jessie
     [ final tests on generated .debs ]
-    % dgit -wgf push jessie
+    % dgit -wgf [--delayed=5] push jessie
     [ enter your gnupg passphrase as prompted ]
     [ see that push and upload are successful ]
     [ prepare and email NMU diff (git-diff, git-format-patch) ]
@@ -108,6 +104,36 @@ tree.
 It also means you don't care about the package clean target,
 which is just as well because many package clean targets are broken.
 
+=head1 OTHER GIT BRANCHES
+
+The dgit git history
+(visible in gitk and git log)
+is not necessarily related to the maintainer's
+or upstream's git history (if any).
+
+If the maintainer has advertised a git repo with
+Vcs-Git
+dgit will set up a remote for it,
+so you can do
+
+=over 4
+
+    % git fetch vcs-git
+
+=back
+
+You can cherry pick changes from there, for example. 
+Note that the maintainer's git history may not be
+suitable for use with dgit.
+For example, it might be a patches-unapplied branch
+or even contain only a debian/ directory.
+
+=head1 UPLOADING TO DELAYED
+
+You can use dgit's I<--delayed> option
+to upload to the DELAYED queue.
+However, you should read the warning about this option in dgit(1).
+
 =head1 SEE ALSO
 
 dgit(1), dgit(7), dgit-maint-*(7)