dgit: cleaning: Improve handling of note about ignores

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index ed5205c4d6b087835741bfbc954cb9225aec2508..60bf0d3767fc157ae80fa7990a047f9bb76a3d38 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -538,6 +538,11 @@ This will delete all files which are not tracked by git.
 options other than dpkg-source
 are useful when the package's clean target is troublesome, or
 to avoid needing the build-dependencies.
+
+dgit will only actually clean the tree if it needs to
+(because it needs to build the source package
+or binaries from your working tree).
+Otherwise any untracked files will be simply ignored.
 .TP
 .BR --clean=git-ff " | " -wgf
 Use
@@ -613,6 +618,11 @@ you will probably need --clean=dpkg-source,no-check aka -wdn.
 Like --clean=dpkg-source, but
 does not care about untracked un-ignored files.
 .TP
+.BR --clean=dpkg-source "[" -d "]" ,all-check " | " -wda " | " -wdda
+Like --clean=dpkg-source, but
+fails even on ignored untracked files.
+This could perhaps be used to detect bugs in your rules clean target.
+.TP
 .BR -N " | " --new
 The package is or may be new in this suite.  Without this, dgit will
 refuse to push.  It may (for Debian, will) be unable to access the git
@@ -1069,6 +1079,24 @@ and the
 .B keyid
 distro config setting.
 .TP
+.RI \fB--curl!:\fR option " | \fB--dput!:\fR" option " |..."
+Specifies an option to remove from the command line for
+a program called by dgit, as for
+\fB--\fR\fIprogram\fI\fB:\fR\fIoption\fR
+(and the same caveats apply).
+
+Any options or arguments exactly identical to
+.I option
+are removed.
+(It is not an error if there were none.)
+
+This can only be used to delete options
+which are always passed by default by dgit,
+or to undo a previous
+\fB--\fR\fIprogram\fI\fB:\fR\fIoption\fR.
+It cannot be used to override option(s) dynamically
+decided on by dgit.
+.TP
 .RI \fB--curl=\fR program " | \fB--dput=\fR" program  " |..."
 Specifies alternative programs to use instead of
 .BR curl ,
@@ -1260,7 +1288,7 @@ but ignored if the value does not make sense to this version of dgit.
 Setting both .clean-mode and .clean-mode-newer is useful
 to provide a single git config compatible with different dgit versions.
 .TP
-.BR dgit-distro. \fIdistro\fR .quilt-
+.BR dgit-distro. \fIdistro\fR .quilt-mode
 One of the values for the command line --quilt= option; used if
 --quilt is not specified.
 .TP