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=4d1a67360d6a4ba9a4700cd08caac5cb840a57dd;hpb=180a9c094c1b1e51281c70940dc451465ec04806;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 4d1a6736..273ef47d 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -257,9 +257,18 @@ This check exists to detect certain likely user errors, but if this situation is true and expected, forcing it is fine. +git-debrebase will try to look for the dgit archive view +of the most recent release, +and if it finds it will make a pseduomerge so that +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.