=head1 BUILDING AND UPLOADING
You can use dpkg-buildpackage(1) for test builds. When you are ready
-to build for an upload, use B<dgit sbuild>.
+to build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit
+cowbuilder>.
Upload with B<dgit push> or B<dgit push-source>. Remember to pass
I<--new> if the package is new in the target suite.
I<OPTIONS> are any further options to be passed on to
gbp-buildpackage(1).
-When you are ready to build for upload, you will probably want to use
-sbuild(1) or pbuilder(1), or do a source-only upload. Either
+If you are doing a source-only upload, you do not need to prepare a
+I<_source.changes>, as B<dgit push-source> will take of that on your
+behalf.
+
+If you need to include binaries with your upload, you will probably
+want to use sbuild(1), pbuilder(1) or cowbuilder(1):
=over 4
=back
-or
+replacing 'sbuild' with 'pbuilder' or 'cowbuilder' if appropriate.
-=over 4
+We use I<--rm-old-changes> to ensure that there is exactly one changes
+file corresponding to this package, so we can be confident we're
+uploading what we intend (though B<dgit push> will do some safety
+checks).
- % dgit --rm-old-changes gbp-build --git-pbuilder
+Note that none of the commands in this section are required to upload
+with dgit. You can invoke gbp-buildpackage(1), pbuilder(1),
+cowbuilder(1) and sbuild(1) directly. However, the defaults for these
+tools may leave you with something that dgit will refuse to upload
+because it doesn't match your git HEAD.
-=back
+As a general rule, leave all signing and tagging to dgit.
+
+=head1 UPLOADING
-or
+Don't use I<--git-tag>: B<dgit push> will do this for you. To do a
+source-only upload:
=over 4
- % dgit --rm-old-changes --gbp build-source
+ % dgit --gbp push-source
=back
-We use I<--rm-old-changes> to ensure that there is exactly one changes
-file corresponding to this package, so we can be confident we're
-uploading what we intend (though B<dgit push> will do some safety
-checks).
-
-Note that all of the commands in this section are not required to
-upload with dgit. You can invoke gbp-buildpackage(1), pbuilder(1) and
-sbuild(1) directly. However, the defaults for these tools may leave
-you with something that dgit will refuse to upload because it doesn't
-match your git HEAD. As a general rule, leave all signing and tagging
-to dgit.
-
-=head1 UPLOADING
-
-Don't use I<--git-tag>: B<dgit push> will do this for you. To upload:
+or if you need to include binaries,
=over 4
=head1 BUILDING AND UPLOADING
-Use B<dgit build>, B<dgit sbuild>, B<dgit build-source>, and B<dgit
-push> as detailed in dgit(1). If any command fails, dgit will provide
-a carefully-worded error message explaining what you should do. If
-it's not clear, file a bug against dgit. Remember to pass I<--new>
-for the first upload.
+Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit
+cowbuilder>, B<dgit push-source>, and B<dgit push> as detailed in
+dgit(1). If any command fails, dgit will provide a carefully-worded
+error message explaining what you should do. If it's not clear, file
+a bug against dgit. Remember to pass I<--new> for the first upload.
As an alternative to B<dgit build> and friends, you can use a tool
like gitpkg(1). This works because like dgit, gitpkg(1) enforces that