From: Ian Jackson Date: Sun, 18 Feb 2018 12:09:11 +0000 (+0000) Subject: git-debrebase: Rename `launder' to `launder-v0' X-Git-Tag: archive/debian/5.0~143 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1ee8b4c148023302d6a90d662c90bd39a070e764 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 --- diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index ca78c938..155d0da5 100644 --- 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 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';