dgit: Honour new .clean-mode-newer access config option

[dgit.git] / dgit.7

diff --git a/dgit.7 b/dgit.7
index 27d0998d8ef5e3bf0d820b4204d94de917c0aea0..d625e8fcbbc32c8a731867a8808e932d7143ff55 100644 (file)
--- 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
@@ -284,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,
@@ -437,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