From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 3 Apr 2018 18:05:24 +0000 (-0700)
Subject: dgit-maint-debrebase(7): fix NMUs section
X-Git-Tag: archive/debian/5.0~6^2~26
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4e55b79ad5c63c08ae88c4966a4ec0a2c4e675b5;p=dgit.git

dgit-maint-debrebase(7): fix NMUs section

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---

diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index f46944fe..68127b90 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -485,9 +485,24 @@ option detailed in gbp-import-orig(1).
 
 =head1 INCORPORATING NMUS
 
+In the simplest case,
+
+=over 4
+
+    % dgit fetch
+    % git merge --ff-only dgit/dgit/sid
+
+=back
+
+If that fails, because your branch and the NMUers work represent
+divergent branches of development, you have a number of options.  Here
+we describe the two simplest.
+
+=head2 Rebasing your work onto the NMU
+
 =over 4
 
-    % dgit pull
+    % git rebase dgit/dgit/sid
 
 =back
 
@@ -498,6 +513,13 @@ 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 SEE ALSO
 
 dgit(1), dgit(7)