diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-08 20:05:26 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-09 00:29:00 +0100 |
| commit | 81e93ac2f3ac0b129f0d5e77d055b99053105892 (patch) | |
| tree | bd9d8b4c44a68959546d2a6e8781ddba8ba70fa9 /git-debrebase.1.pod | |
| parent | 9cda023c0c49449a1d5862483df8d785e062765b (diff) | |
git-debrebase convert-from-gbp: Add ffq check
Check that the result will not count as having diverged. This will
usually turn failures to make the ff pseudomerge into -fdiverged.
Related to #903132.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index d67e557..273ef47 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</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. |