chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase convert-from-gbp: Add ffq check
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index d67e5570452d699851564860cc1a2e980d6ef718..273ef47dc1c13ee465d59950783a1f495b63763d 100644
(file)
--- 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.
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.
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.