dgit: Provide dotdot_bpd_transfer_origs for using origs from ..

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index ed5205c4d6b087835741bfbc954cb9225aec2508..6f8957444ccc3f911444a9a4e91e637a83ab7986 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -538,6 +538,13 @@ 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.
 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
+it will just check that there are no untracked unignored files.
+See --clean=git[-ff],always, below.

 .TP
 .BR --clean=git-ff " | " -wgf
 Use
 .TP
 .BR --clean=git-ff " | " -wgf
 Use


@@ -548,6 +555,10 @@ git clean -xdf
 but it also removes any subdirectories containing different git
 trees (which only unusual packages are likely to create).
 .TP
 but it also removes any subdirectories containing different git
 trees (which only unusual packages are likely to create).
 .TP

+.BR --clean=git "[" -ff "]" ,always " | " -wga " | " -wgfa
+Like --clean=git, but always does the clean and not just a check,
+deleting any untracked un-ignored files.
+.TP

 .BR --clean=check " | " --clean=check,ignores " | " -wc " | " -wci
 Merely check that the tree is clean (does not contain uncommitted
 files).
 .BR --clean=check " | " --clean=check,ignores " | " -wc " | " -wci
 Merely check that the tree is clean (does not contain uncommitted
 files).


@@ -613,6 +624,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
 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
 .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 +1085,24 @@ and the
 .B keyid
 distro config setting.
 .TP
 .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 ,
 .RI \fB--curl=\fR program " | \fB--dput=\fR" program  " |..."
 Specifies alternative programs to use instead of
 .BR curl ,


@@ -1260,7 +1294,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
 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
 One of the values for the command line --quilt= option; used if
 --quilt is not specified.
 .TP