X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.7;h=8325c06b10aaeed869c49d41345d9e24b4ea4fd3;hp=c15092129b3f0db001e0504ee423709cf73904ea;hb=bf85ea84b8f545b8098467b1991e7f0ffff4db13;hpb=a88577467219f6813799d41cc80ae32c176cd8a5 diff --git a/dgit.7 b/dgit.7 index c1509212..8325c06b 100644 --- a/dgit.7 +++ b/dgit.7 @@ -161,7 +161,7 @@ or to try to upload to it. When using this facility, it is important to always specify the same suites in the same order: -dgit will not be make a coherent fast-forwarding history +dgit will not make a coherent fast-forwarding history view otherwise. The history generated by this feature is not normally suitable @@ -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, @@ -361,7 +361,7 @@ whose tree is identical to o+d/p in all upstream files. In the error message, 696c9bd5..84ae8f96 is the first commit child-parent edge -which cannot be sensibly be +which cannot sensibly be either ignored, or turned into a patch in debian/patches. In this example, this is because it itself changes files in debian/patches, @@ -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