path: root/git-debrebase.1.pod
diff options
authorIan Jackson <>2018-02-19 01:13:50 +0000
committerIan Jackson <>2018-06-16 16:07:00 +0100
commit1c1b1794d142a1a5385775576e276d8a500d9aae (patch)
tree652ed0afcec2aa38c0e105deebbaeb2d7f26955a /git-debrebase.1.pod
parent952789d95a825aff6524ec45829ed0d9bfd50f6d (diff)
git-debrebase(1): document convert-from-gbp
Signed-off-by: Ian Jackson <>
Diffstat (limited to 'git-debrebase.1.pod')
1 files changed, 32 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index ce442da..40c8081 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -155,6 +155,38 @@ that its command line syntax is optimal.
We may want to introduce an incompatible replacement syntax
under the name C<new-upstream>.
+=item git-debrebase convert-from-gbp [<upstream-commitish>]
+Cnnverts a gbp patches-unapplied branch
+(not a gbp pq patch queue branch)
+into a git-debrebase interchange branch.
+This is done by generating a new anchor merge,
+converting the quilt patches as a delta queue,
+and dropping the patches from the tree.
+The upstream commitish should correspond to
+the gbp upstream branch.
+It is a problem if it is not an ancestor of HEAD,
+or if the history between the upstream and HEAD
+contains commits which make changes to upstream files.
+It is also a problem if the specified upstream
+has a debian/ subdirectory.
+This check exists to detect certain likely user errors,
+but if this situation is true and expected,
+forcing it is fine.
+The result is a well-formed git-debrebase interchange branch.
+The result is also fast-forward from the gbp 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.
+At worst,
+using the wrong tool for the branch format might result in
+a dropped patch queue!