X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-nmu-simple.7.pod;h=0d2525fc0bce39de870f2c8d3b5e577980f52e61;hp=56b399a6d683aed654ee8217485b9c9043dbfcfe;hb=a02cbb3c36fa4dc9b073d9494f7b4cedb54f1f08;hpb=c4dea463ddc76cf7e39612dbdce3b18a5a0db957

diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod
index 56b399a6..0d2525fc 100644
--- a/dgit-nmu-simple.7.pod
+++ b/dgit-nmu-simple.7.pod
@@ -15,7 +15,7 @@ The Debian Developers' Reference has some
 (sometimes questionable) guidance on this.
 
 Conversely, you do not need to know anything
-about the usual maintainer's workflow.
+about the usual maintainer's git workflow.
 If appropriate, you can work on many different packages,
 making similar changes,
 without worrying about the individual maintainers' git practices.
@@ -39,13 +39,14 @@ consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
     % dgit clone glibc jessie
     % cd glibc
     % git am ~/glibc-security-fix.diff
-    [ edit debian/changelog to introduce a ~ version, and commit it ]
+    % 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 ]
-    [ edit debian/changelog to prepare for release, and commit it ]
+    % 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) ]
@@ -55,10 +56,10 @@ consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
 =head1 WHAT KIND OF CHANGES AND COMMITS TO MAKE
 
 When preparing an NMU, the git commits you make on the dgit branch
-should be simple linear series of commmits with good commit messages.
+should be simple linear series of commits with good commit messages.
 The commit messages will be published in various ways,
 including perhaps being used as the cover messages for
-genrated quilt patches.
+generated quilt patches.
 
 Do not make merge commits.
 Do not try to rebase to drop patches - if you need to revert a
@@ -103,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)