git-debrebase: walk: Reintroduce the local $read_tree_upstream sub

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

diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod
index f1e8543d497c6762c74721382b4eb1be007c732b..0d2525fc0bce39de870f2c8d3b5e577980f52e61 100644 (file)
--- 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
@@ -60,10 +56,10 @@ to upload to the DELAYED queues.
 =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
@@ -108,6 +104,30 @@ 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