summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2024-05-28 14:05:50 -0700
committerTakashi Kokubun <takashikkbn@gmail.com>2024-05-28 14:05:51 -0700
commitd1265d6172f2772bd4b37cf72689de28edce8a96 (patch)
tree9009a917674c7e548cac4dd4c7f50fc81c4a728c
parent7a860bacee34d082f9731f5edbeea49ee405a268 (diff)
merger.rb: Improve the help message
It wasn't clear whether the backport command takes a commit hash or a ticket number.
-rwxr-xr-xtool/merger.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index 9aac5e8569..39459003a5 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -18,10 +18,10 @@ class << Merger = Object.new
def help
puts <<-HELP
\e[1msimple backport\e[0m
- ruby #$0 1234
+ ruby #$0 1234abc
\e[1mbackport from other branch\e[0m
- ruby #$0 17502 mvm
+ ruby #$0 1234abc mvm
\e[1mrevision increment\e[0m
ruby #$0 revisionup
@@ -30,16 +30,16 @@ class << Merger = Object.new
ruby #$0 teenyup
\e[1mtagging major release\e[0m
- ruby #$0 tag 2.2.0
+ ruby #$0 tag 3.2.0
-\e[1mtagging patch release\e[0m (about 2.1.0 or later, it means X.Y.Z (Z > 0) release)
+\e[1mtagging patch release\e[0m (for 2.1.0 or later, it means X.Y.Z (Z > 0) release)
ruby #$0 tag
\e[1mtagging preview/RC\e[0m
- ruby #$0 tag 2.2.0-preview1
+ ruby #$0 tag 3.2.0-preview1
\e[1mremove tag\e[0m
- ruby #$0 removetag 2.2.9
+ ruby #$0 removetag 3.2.9
\e[33;1m* all operations shall be applied to the working directory.\e[0m
HELP