X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.7;h=c15092129b3f0db001e0504ee423709cf73904ea;hp=b623d8cf6af252261a1dd16961ff7be9812a0a7c;hb=38310744b1522293aa0c95e6a6c34671d2f4dd44;hpb=80489b3ec6643c06d525ec39a7d72135286ba62c diff --git a/dgit.7 b/dgit.7 index b623d8cf..c1509212 100644 --- a/dgit.7 +++ b/dgit.7 @@ -249,6 +249,16 @@ See and .B dgit setup-gitattributes in dgit(1). + +Note that dgit does not disable gitattributes +unless they would actually interfere with your work on dgit branches. +In particular, gitattributes which affect +.B git archive +are not disabled, +so .origs you generate by hand can be wrong. +You should consider using +.B git-deborig (1) +which gets this right, suppressing the attributes. .SH PACKAGE SOURCE FORMATS If you are not the maintainer, you do not need to worry about the source format of the package. You can just make changes as you like @@ -377,6 +387,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