dgit: add dgit.default.build-products-dir git configuration key

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index e7ab454adc1c71fb4b381a5a4b9d3e25558d702f..ddb0c0a05b278f08760982d468262c0102b93641 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -46,6 +46,7 @@ dgit-maint-debrebase(7)       for maintainers: a pure-git rebasish workflow
 dgit-maint-merge(7)    for maintainers: a pure-git merging workflow
 dgit-maint-gbp(7)      for maintainers already using git-buildpackage
 dgit-sponsorship(7)    for sponsors and sponsored contributors
 dgit-maint-merge(7)    for maintainers: a pure-git merging workflow
 dgit-maint-gbp(7)      for maintainers already using git-buildpackage
 dgit-sponsorship(7)    for sponsors and sponsored contributors

+dgit-downstream-dsc(7) setting up dgit push for a new distro

 .TE
 .LP
 See \fBdgit(7)\fP for detailed information about the data
 .TE
 .LP
 See \fBdgit(7)\fP for detailed information about the data


@@ -227,9 +228,6 @@ dgit push always uses the package, suite and version specified in the
 debian/changelog and the .dsc, which must agree.  If the command line
 specifies a suite then that must match too.
 
 debian/changelog and the .dsc, which must agree.  If the command line
 specifies a suite then that must match too.
 

-With \fB-C\fR, performs a dgit push, additionally ensuring that no
-binary packages are uploaded.
-

 When used on a git-debrebase branch,
 dgit calls git-debrebase
 to prepare the branch
 When used on a git-debrebase branch,
 dgit calls git-debrebase
 to prepare the branch


@@ -239,6 +237,9 @@ for source package upload and push.
 Without \fB-C\fR, builds a source package and dgit pushes it.  Saying
 \fBdgit push-source\fR is like saying "update the source code in the
 archive to match my git HEAD, and let the autobuilders do the rest."
 Without \fB-C\fR, builds a source package and dgit pushes it.  Saying
 \fBdgit push-source\fR is like saying "update the source code in the
 archive to match my git HEAD, and let the autobuilders do the rest."

+
+With \fB-C\fR, performs a dgit push, additionally ensuring that no
+binary packages are uploaded.

 .TP
 \fBdgit rpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR [\fIpush args...\fR]
 Pushes the contents of the specified directory on a remote machine.
 .TP
 \fBdgit rpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR [\fIpush args...\fR]
 Pushes the contents of the specified directory on a remote machine.


@@ -841,6 +842,11 @@ regardless of this option.
 Specifies where to find the built files to be uploaded.
 By default, dgit looks in the parent directory
 .RB ( .. ).
 Specifies where to find the built files to be uploaded.
 By default, dgit looks in the parent directory
 .RB ( .. ).

+
+Also see the
+.BI dgit.default.build-products-dir
+configuration option
+(which this command line option overrides).

 .TP
 .BI --no-rm-on-error
 Do not delete the destination directory if clone fails.
 .TP
 .BI --no-rm-on-error
 Do not delete the destination directory if clone fails.


@@ -1050,6 +1056,17 @@ The result is a fresh import,
 discarding the git history
 that the person who pushed that .dsc was working with.
 .TP
 discarding the git history
 that the person who pushed that .dsc was working with.
 .TP

+.B --force-uploading-binaries
+Carry on and
+upload binaries
+even though dgit thinks your distro does not permit that.
+.TP
+.B --force-uploading-source-only
+Carry on and do a source-only upload,
+without any binaries,
+even though dgit thinks your distro does not permit that,
+or does not permit that in this situation.
+.TP

 .B --force-unrepresentable
 Carry on even if
 dgit thinks that your git tree contains changes
 .B --force-unrepresentable
 Carry on even if
 dgit thinks that your git tree contains changes


@@ -1084,6 +1101,12 @@ on the dgit command line.
 .LP
 Settings likely to be useful for an end user include:
 .TP
 .LP
 Settings likely to be useful for an end user include:
 .TP

+.BI dgit.default.build-products-dir
+Specifies where to find the built files to be uploaded,
+when --build-products-dir is not specified.  The default is
+the parent directory
+.RB ( .. ).
+.TP

 .BR dgit-suite. \fIsuite\fR .distro " \fIdistro\fR"
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro
 .BR dgit-suite. \fIsuite\fR .distro " \fIdistro\fR"
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro


@@ -1226,6 +1249,8 @@ or when pushing and
 .TP
 .BI dgit-distro. distro .rewrite-map-enable
 .TP
 .TP
 .BI dgit-distro. distro .rewrite-map-enable
 .TP

+.BR dgit-distro. \fIdistro\fR .source-only-uploads " " ok | always | never | not-wholly-new
+.TP

 .BI dgit.default.old-dsc-distro
 .TP
 .BI dgit.dsc-url-proto-ok. protocol
 .BI dgit.default.old-dsc-distro
 .TP
 .BI dgit.dsc-url-proto-ok. protocol