path: root/dgit-maint-debrebase.7.pod
diff options
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
1 files changed, 23 insertions, 1 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index f46944f..68127b9 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -485,9 +485,24 @@ option detailed in gbp-import-orig(1).
+In the simplest case,
+=over 4
+ % dgit fetch
+ % git merge --ff-only dgit/dgit/sid
+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
@@ -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<dgit push> will require
=head1 SEE ALSO
dgit(1), dgit(7)