diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-17 10:05:35 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-17 10:05:35 -0700 |
commit | 5ca29dfbaba58a6ed167a038b2bcefb07083b04c (patch) | |
tree | f1202a0e444c6524e3fc7479d628a19fb62c41b3 /dgit-nmu-simple.7.pod | |
parent | e163c8511130654982c5bd79c145e903e8fca1ca (diff) | |
parent | c487f49f00c2a7ab106ef4e5f6cb043e72028986 (diff) |
Merge remote-tracking branch 'dgit/dgit/stretch' into jessie-bpo
Diffstat (limited to 'dgit-nmu-simple.7.pod')
-rw-r--r-- | dgit-nmu-simple.7.pod | 4 |
1 files changed, 2 insertions, 2 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 |