summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-18 12:09:11 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:06:58 +0100
commit1ee8b4c148023302d6a90d662c90bd39a070e764 (patch)
treedbf538e8ea38a33720e241d20185f4ca08c7ac0e
parent9157ed980b82c0664685e1cf8941c360fb2b11e1 (diff)
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>
-rw-r--r--NOTES.git-debrebase2
-rwxr-xr-xgit-debrebase6
2 files changed, 3 insertions, 5 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index ca78c93..155d0da 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 bc98756..c32f257 100755
--- 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';