From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 12:22:06 +0000 (+0000)
Subject: git-debrebase: convert-to-gbp: declare it not v0
X-Git-Tag: archive/debian/5.0~183
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0357e638d318892b579635b1e1b34e514dbcd01b;p=dgit.git

git-debrebase: convert-to-gbp: declare it not v0

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

diff --git a/git-debrebase b/git-debrebase
index c497631c..0e199b85 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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];