summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-17 12:22:06 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:03:12 +0100
commit0357e638d318892b579635b1e1b34e514dbcd01b (patch)
tree2f734fa8a5631580c999062166903e507f958b33 /git-debrebase
parent615c5264953f09dc873ac65779ec565f1d239af6 (diff)
git-debrebase: convert-to-gbp: declare it not v0
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index c497631..0e199b8 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];