such as people using dgit to do an NMU (see dgit-nmu-simple(7) and
dgit-user(7)).
-=item
-
-Incorporate NMUs with a single command (see below).
-
=back
Note that we assume a patches-unapplied repository: the upstream
=head1 BUILDING
-If you use gbp-buildpackage(1) to generate your orig tarballs, you
-will need to perform the first build with gbp-buildpackage(1) directly
-(this is due to Debian bug #841084).
-
-Otherwise, you can perform builds like this:
+You can perform builds like this:
=over 4
You will need to pass I<--overwrite> if the previous upload was not
performed with dgit.
-=head1 INCORPORATING NMUS
-
-=over 4
-
- % dgit --gbp pull
+If this is first ever dgit push of the package, consider passing
+I<--deliberately-not-fast-forward> instead of I<--overwrite>. This
+avoids introducing a new origin commit into the dgit view of your git
+history. (This origin commit would represent the most recent non-dgit
+upload of the package, but this should already be represented in your
+git history.)
-=back
+=head1 INCORPORATING NMUS
-Alternatively, you can apply the NMU diff to your repository. The
-next push will then require I<--overwrite>.
+B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp
+branches. You can just apply the NMU diff the traditional way. The
+next upload will require I<--overwrite>.
=head1 SEE ALSO