From 81e93ac2f3ac0b129f0d5e77d055b99053105892 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 8 Jul 2018 20:05:26 +0100 Subject: 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 --- git-debrebase.1.pod | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git-debrebase.1.pod') 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, 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. -- cgit v1.2.3