Merge tag 'debian/6.11' into stretch-bpo

dgit release 6.11 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Sun 26 Aug 2018 01:58:34 PM MST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

1 files changed, 16 insertions, 0 deletions

diff --git a/dgit.7 b/dgit.7
index b623d8c..c150921 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