dgit-badcommit-fixup: Instructions comment

[dgit.git] / dgit-nmu-simple.7.pod

diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod
index 057f1c8511c16e2ce46242d287c5905090c0a875..3ebc68a420ebebec62d084946c4549a7931d299e 100644 (file)
--- a/dgit-nmu-simple.7.pod
+++ b/dgit-nmu-simple.7.pod
@@ -39,14 +39,14 @@ consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
     % dgit clone glibc jessie
     % cd glibc
     % git am ~/glibc-security-fix.diff
-    % dch --nmu Apply upstream's fix for foo bug.
+    % dch --nmu "Apply upstream's fix for foo bug."
     % git add debian/changelog && git commit -m"NMU changelog entry"
     % dpkg-buildpackage -uc -b
     [ run your tests ]
     % 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) ]
@@ -104,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)