From 4e55b79ad5c63c08ae88c4966a4ec0a2c4e675b5 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 3 Apr 2018 11:05:24 -0700 Subject: [PATCH] dgit-maint-debrebase(7): fix NMUs section Signed-off-by: Sean Whitton --- dgit-maint-debrebase.7.pod | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) 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, say, you can manually apply the NMU debdiff, +commit and debrebase. The next B will require +I<--overwrite>. + =head1 SEE ALSO dgit(1), dgit(7) -- 2.30.2