diff options
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 4d1a673..273ef47 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</Establish the current branch's ffq-prev>, 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. |