X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-debrebase.7.pod;h=0f2f89288892722374aa392cab508300ae0e5824;hp=6223e8722179518a684299f2a38c7976b4e3ead1;hb=dea27c626d6c39d11a1b591005fd2e6e2a17e295;hpb=667143e23992efc090164cb105bad1dc4c116e5d diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 6223e872..0f2f8928 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -619,13 +619,18 @@ using git-rebase(1) directly. For example, =over 4 - % git debrebase launder + % git debrebase % git rebase -i HEAD~5 # there are 4 Debian patches =back If you take this approach, you should be very careful not to start the -rebase too early. +rebase too early, +including before the most recent pseudomerge. +git-rebase without a base argument will often +start the rebase too early, +and should be avoided. +Run git-debrebase instead. =head1 SEE ALSO