X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=c32f257a5f0543d1d73c5c477aedb4ddd01aecf9;hp=bc98756f514a4e0b786329d20ef00e4d38a774d1;hb=1ee8b4c148023302d6a90d662c90bd39a070e764;hpb=9157ed980b82c0664685e1cf8941c360fb2b11e1 diff --git a/git-debrebase b/git-debrebase index bc98756f..c32f257a 100755 --- a/git-debrebase +++ b/git-debrebase @@ -29,8 +29,8 @@ # git-debrebase [ --] [] # git-debrebase [] analyse # git-debrebase [] breakwater # prints breakwater tip only -# git-debrebase [] launder # prints breakwater tip etc. # git-debrebase [] stitch [--prose=] +# git-debrebase [] launder-v0 # prints breakwater tip etc. # git-debrebase [] downstream-rebase-launder-v0 # experimental # # git-debrebase [] convert-from-gbp [] @@ -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';