+If the NMUer added new commits modifying the upstream source, you will
+probably want to debrebase before your next upload to tidy those up.
+
+For example, the NMUer might have used git-revert(1) to unapply one of
+your patches. A debrebase will strip both the patch and the reversion
+from the delta queue.
+
+=head2 Manually applying the debdiff
+
+If you cannot rebase because you have already pushed to
+B<salsa.debian.org>, say, you can manually apply the NMU debdiff,
+commit and debrebase. The next B<dgit push> will require
+I<--overwrite>.
+
+=head1 HINTS AND TIPS
+
+=head2 Minimising pseudomerges
+
+Above we noted that each time you conclude a debrebase, you introduce
+a pseudomerge into your git history, which may make it harder to read.
+
+A convention you can use to minimise the number of pseudomerges is to
+debrebase only right before you upload.
+
+Before that point, instead of editing the existing delta queue, you
+append fixup commits (and reversions of commits) that alter the
+upstream source to the required state. You can freely push and pull
+from B<salsa.debian.org> during this. Just before uploading, you
+debrebase, once, to tidy everything up.
+
+=head2 Upstream branches
+
+Except in the case where upstream releases only tarballs, we do not
+maintain a separate 'upstream' branch (unless you also happen to be
+involved in upstream development). We work with upstream tags rather
+than any branches, except temporary branches used to prepare patches
+for forwarding upstream, for example.
+
+The thought behind this is that branches are things to which one
+expects to commit, while tags are immutable points in history. From
+the Debian point of the view, the upstream source is immutable. It's
+our packaging to which we expect to commit.
+
+=head2 The first ever dgit push
+
+If this is the 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 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.)
+
+=head2 Alternative ways to start a debrebase
+
+Above we started an interactive debrebase by invoking git-debrebase(1)
+like this: