X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.7;h=d625e8fcbbc32c8a731867a8808e932d7143ff55;hb=ea137f08b5e052d78154acc27f21341e8df6d3cc;hp=c15092129b3f0db001e0504ee423709cf73904ea;hpb=a0f8574f94712304142296a28251c222dbb3f203;p=dgit.git diff --git a/dgit.7 b/dgit.7 index c1509212..d625e8fc 100644 --- a/dgit.7 +++ b/dgit.7 @@ -294,7 +294,7 @@ pushing. The only thing you need to know is that dgit build, sbuild, etc., may make new commits on your HEAD. If you're not a quilt user this commit won't contain any changes to files you care about. -Simply commiting to source files +Simply committing to source files (whether in debian/ or not, but not to patches) will result in a branch that dgit quilt-fixup can linearise. Other kinds of changes, @@ -447,7 +447,7 @@ As the maintainer you therefore have the following options: Delete the files from your git branches, and your Debian source packages, and carry the deletion as a delta from upstream. -(With `3.0 (quilt)' this means represeting the deletions as patches. +(With `3.0 (quilt)' this means representing the deletions as patches. You may need to pass --include-removal to dpkg-source --commit, or pass corresponding options to other tools.) This can make the Debian