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=3ebc68a420ebebec62d084946c4549a7931d299e;hb=bada5f43152b731b980626f5f995da1899bc568d;hpb=ce5871dd987f455743c6f856b6c2114dd60c87af;ds=inline diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod index 3ebc68a4..0d2525fc 100644 --- a/dgit-nmu-simple.7.pod +++ b/dgit-nmu-simple.7.pod @@ -56,10 +56,10 @@ consult the appropriate C 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