git-debrebase: Provide convert-from-unapplied aa alias for -gbp

Closes: #905433.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index fee793c92597f19761828bcda353167385d93420..829ab82ce6e44941e0be6ddb83ff7922bf3b573e 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -2537,6 +2537,7 @@ sub complete_convert_from ($$$$) {
     update_head_checkout $old_head, $new_head, $mrest;
 }
 
+sub cmd_convert_from_unapplied () { cmd_convert_from_gbp(); }
 sub cmd_convert_from_gbp () {
     badusage __ "want only 1 optional argument, the upstream git commitish"
        unless @ARGV<=1;

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index a964180d7890491398ac93116edb3f528d09a476..00b664b756f2d81bcb77464065a229fdfebfc448 100644 (file)
--- 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.