summaryrefslogtreecommitdiff
path: root/git-debrebase.1.pod
diff options
context:
space:
mode:
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r--git-debrebase.1.pod4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index a964180..00b664b 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -254,6 +254,8 @@ If the problem is simply that
the existing patches were not made by git-debrebase,
using dgit quilt-fixup instead should succeed.
+=item git-debrebase convert-from-unapplied [<upstream-commit-ish>]
+
=item git-debrebase convert-from-gbp [<upstream-commit-ish>]
Cnnverts any of the following into a git-debrebase interchange branch:
@@ -277,6 +279,8 @@ so there are no patches
=back
+(These two commands operate identically and are simply aliases.)
+
The conversion is done by generating a new anchor merge,
converting any quilt patches as a delta queue,
and dropping the patches from the tree.