git-debrebase: Rename `launder' to `launder-v0'

This command is too raw, really, and we may want that name for
something else (eg, rebase and stitch).

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

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index ca78c9386414aeff95a719b7ca2d37642051194b..155d0da56cc8c87b45ba8e20d8ec7588840a6311 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -1,8 +1,6 @@
 TODO
    --anchor option to specify commit(s) to treat as as anchor(s)
 
-   rename "launder" operation to "launder-v0"
-
    reference docs
       git-debrebase(5)   data model
       git-debrebase(1)   command line

diff --git a/git-debrebase b/git-debrebase
index bc98756f514a4e0b786329d20ef00e4d38a774d1..c32f257a5f0543d1d73c5c477aedb4ddd01aecf9 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -29,8 +29,8 @@
 #    git-debrebase [<options> --] [<git-rebase options...>]
 #    git-debrebase [<options>] analyse
 #    git-debrebase [<options>] breakwater      # prints breakwater tip only
-#    git-debrebase [<options>] launder         # prints breakwater tip etc.
 #    git-debrebase [<options>] stitch [--prose=<for commit message>]
+#    git-debrebase [<options>] launder-v0      # prints breakwater tip etc.
 #    git-debrebase [<options>] downstream-rebase-launder-v0  # experimental
 #
 #    git-debrebase [<options>] convert-from-gbp [<upstream-git-rev>]
@@ -857,8 +857,8 @@ sub update_head_postlaunder ($$$) {
     runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
 }
 
-sub cmd_launder () {
-    badusage "no arguments to launder allowed" if @ARGV;
+sub cmd_launder_v0 () {
+    badusage "no arguments to launder-v0 allowed" if @ARGV;
     my $old = get_head();
     my ($tip,$breakwater,$last_anchor) = walk $old;
     update_head_postlaunder $old, $tip, 'launder';