X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-maint-debrebase.7.pod;h=b3700a467e56463c302cf0173b0673865650a694;hb=cd82d4ac2910c5dc9a336009ab8a26f88bb7961f;hp=373fb2f7aa335456d09aee970e4d4f05b4972021;hpb=bc83ffe7319cab9f1b76b47de9426340836872fe;p=dgit.git diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 373fb2f7..b3700a46 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -394,8 +394,6 @@ or if you have a working watch file =back -replacing I<1.2.3> with I if you imported a tarball. - This invocation of git-debrebase(1) involves a git rebase. You may need to resolve conflicts if the Debian delta queue does not apply cleanly to the new upstream source. @@ -488,6 +486,10 @@ fast-forwarding from the history on B. In such cases you will have to pass I<--overwrite> to dgit. git-debrebase will normally tell you if this will be needed. +If you want to upload with git-debpush(1), for the first upload you +should pass the B<--quilt=linear> quilt mode option (see +git-debpush(1)). + Right before uploading, if you did not just already do so, you might want to have git-debrebase(1) shuffle your branch such that the Debian delta queue appears right at the tip of the branch you will push: