X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.7;h=8325c06b10aaeed869c49d41345d9e24b4ea4fd3;hb=336354ae2894e7d677c0d80fff8fd54e275e025b;hp=d625e8fcbbc32c8a731867a8808e932d7143ff55;hpb=ea137f08b5e052d78154acc27f21341e8df6d3cc;p=dgit.git diff --git a/dgit.7 b/dgit.7 index d625e8fc..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 @@ -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,