changelog: Document reorganisations

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index cbf0cde5ec042476b6c20f1341abb38cadd241cf..67aa2fab65c2785091ae5847dfb110225f03d2b0 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -14,7 +14,7 @@ dgit \- git integration with the Debian archive
 .br
 .B dgit
 [\fIdgit\-opts\fP] \fBbuild\fP|\fBsbuild\fP|\fBbuild-source\fP
 .br
 .B dgit
 [\fIdgit\-opts\fP] \fBbuild\fP|\fBsbuild\fP|\fBbuild-source\fP

-[\fIbuild\-opts\fp]
+[\fIbuild\-opts\fP]

 .br
 .B dgit
 [\fIdgit\-opts\fP] \fBpush\fP|\fBpush-source\fP [\fIdgit\-opts\fP]
 .br
 .B dgit
 [\fIdgit\-opts\fP] \fBpush\fP|\fBpush-source\fP [\fIdgit\-opts\fP]


@@ -109,6 +109,27 @@ branch
 .BI remotes/dgit/dgit/ suite
 into the current branch.
 .TP
 .BI remotes/dgit/dgit/ suite
 into the current branch.
 .TP

+\fBdgit checkout\fR \fIsuite\fR
+Checks out the local branch
+.BR dgit/ \fIsuite\fR.
+
+If the branch does not exist,
+dgit checkout creates it,
+and sets it up the same way as dgit clone would.
+In that case, if
+the archive remote tracking branch does not exist,
+dgit checkout will do a dgit fetch first.
+
+NB: dgit checkout will only do a fetch if it has to.
+If you already have the suite branch,
+and want to merge your branch with updates from the archive,
+use dgit pull.
+
+dgit checkout will normally need to aceess the archive server,
+to canonicalise the provided suite name.
+The exception is if you specify the canonical name,
+and the branch (or tracking branch) already exists.
+.TP

 \fBdgit build\fR ...
 Runs
 .B dpkg-buildpackage
 \fBdgit build\fR ...
 Runs
 .B dpkg-buildpackage


@@ -206,9 +227,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


@@ -218,6 +236,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.


@@ -1029,6 +1050,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


@@ -1205,6 +1237,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