diff options
| -rw-r--r-- | dgit-nmu-simple.7.pod | 4 | ||||
| -rw-r--r-- | dgit-user.7.pod | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod index 3ebc68a..0d2525f 100644 --- a/dgit-nmu-simple.7.pod +++ b/dgit-nmu-simple.7.pod @@ -56,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 diff --git a/dgit-user.7.pod b/dgit-user.7.pod index d7b6109..aacdf4d 100644 --- a/dgit-user.7.pod +++ b/dgit-user.7.pod @@ -232,7 +232,7 @@ that are in debian/patches before you do anything else! Debian package builds are often quite messy: they may modify files which are also committed to git, -or leave outputs and teporary files not covered by C<.gitignore>. +or leave outputs and temporary files not covered by C<.gitignore>. If you always commit, you can use |