X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=273ef47dc1c13ee465d59950783a1f495b63763d;hb=12a39369798685e87a0e67d528bc997eb71d7972;hp=d67e5570452d699851564860cc1a2e980d6ef718;hpb=9cda023c0c49449a1d5862483df8d785e062765b;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index d67e5570..273ef47d 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -265,6 +265,10 @@ your new git-debrebase view is appropriately fast forward. The result is a well-formed git-debrebase interchange branch. The result is also fast-forward from the gbp branch. +It is a snag if the new branch looks like it will have diverged, +just as for a laundering/unstitching call to git-debrebase; +See L, below. + Note that it is dangerous not to know whether you are dealing with a gbp patches-unappled branch containing quilt patches, or a git-debrebase interchange branch.