chiark / gitweb /
git-debrebase: convert-to-gbp: declare it not v0
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 12:22:06 +0000 (12:22 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:03:12 +0000 (16:03 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index c497631c874b8c44391539c618eba04256c32e1d..0e199b852a747d3e9d225a69d8d5bca0a1003ee5 100755 (executable)
@@ -34,6 +34,7 @@
 #    git-debrebase [<options>] downstream-rebase-launder-v0  # experimental
 #
 #    git-debrebase [<options>] convert-from-gbp <upstream-git-rev>
+#    git-debrebase [<options>] convert-to-gbp
 
 # problems / outstanding questions:
 #
@@ -1277,8 +1278,7 @@ sub cmd_convert_from_gbp () {
     update_head_checkout $old_head, $work, 'convert-from-gbp';
 }
 
-sub cmd_convert_to_gbp_v0 () {
-    # v0 because very raw; does not make pseudomerges or anything
+sub cmd_convert_to_gbp () {
     badusage "no arguments allowed" if @ARGV;
     my $head = get_head();
     my $ffq = (ffq_prev_branchinfo())[3];