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=0d2525fc0bce39de870f2c8d3b5e577980f52e61;hp=b30934f8b5799439b06bacf03f39f4864f94b499;hb=a0ebfd60790ce326fbde74744939588ee6f1d7d7;hpb=cb809d942c58dea5dfba6ad8b7e3298338ebb24e diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod index b30934f8..0d2525fc 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 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