Fix some bugs in dgit fetch --dry-run which made dgit push --dry-run often not work...

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 9740856b215a59d62c8790743b3cb2faa2d2b023..86f19b491b5c7206daf19517016288fe0dfea759 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -342,6 +342,21 @@ This is the default.  It requires the package's build dependencies.
 The package may be new in this suite.  Without this, dgit will
 refuse to push.
 .TP
+.BR --ignore-dirty
+Do not complain if the working tree does not match your git HEAD.
+This can be useful with build, if you plan to commit later.  (dgit
+push will still ensure that the .dsc you upload and the git tree
+you push are identical, so this option won't make broken pushes.)
+
+This option may not work properly on `3.0 (quilt)' packages, as in
+that case dgit needs to use and perhaps commit parts of your working
+tree.
+.TP
+.BR --no-quilt-fixup
+Do not fix up source format `3.0 (quilt)' metadata.  If you use this
+option and the package did in fact need fixing up, dgit push will
+fail.
+.TP
 .BI -D
 Prints debugging information to stderr.  Repeating the option produces
 more output (currently, up to -DD is meaningfully different).
@@ -550,5 +565,6 @@ sane way to find the path in the archive pool of the .dsc for a
 particular suite.  I'm assured that the archive layout is a
 `well known algorithm' by now.
 
---dry-run often does not work with fetch, even though this is a
-logically plausible request.  (It fails, instead.)
+--dry-run does not always work properly, as not doing some of the git
+fetches may result in subsequent actions being different.  Doing a
+non-dry-run dgit fetch first will help.