X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.7;h=27d0998d8ef5e3bf0d820b4204d94de917c0aea0;hb=3553a7c60866f392445d7bbf2ed028f3f92da33d;hp=0d43ee0d7f70f668156718bd40ab662b690ea53c;hpb=0c285f61c99f278e9cf6b121037bbce8f9d0e3b9;p=dgit.git diff --git a/dgit.7 b/dgit.7 index 0d43ee0d..27d0998d 100644 --- a/dgit.7 +++ b/dgit.7 @@ -298,7 +298,8 @@ If you are a quilt user you need to know that dgit's git trees are `patches applied packaging branches' and do not contain the .pc directory (which is used by quilt to record which patches are applied). If you want to manipulate the patch stack you probably want -to be looking at tools like git-dpm. +to be looking at tools like +git-debrebase, gbp pq, or git-dpm. .SS quilt fixup error messages When dgit's quilt fixup fails, it prints messages like this: @@ -376,6 +377,12 @@ that are not representable by dpkg-source (such as some mode changes). Or maybe you just forgot a necessary .B --quilt= option. + +Finally, +this problem can occur if you have provided +Debian git tooling such as git-debrebase, git-dpm or git-buildpackage +with upstream git commit(s) or tag(s) +which are not 100% identical to your orig tarball(s). .SH SPLIT VIEW QUILT MODE When working with git branches intended for use with the `3.0 (quilt)' source format