From 57225dc07a3fcc745c7aecc1fb04182b156ad29f Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Thu, 25 Apr 2019 19:24:56 +0900
Subject: Show `make checkout-github/merge-github` in help


diff --git a/common.mk b/common.mk
index 3c5f1a3..3516f1c 100644
--- a/common.mk
+++ b/common.mk
@@ -1462,6 +1462,8 @@ update-man-date: PHONY https://github.com/ruby/ruby/blob/trunk/#L1462
 	-e '$$_.sub!(/^(\.Dd ).*/){$$1+@v...(ARGF.path).strftime("%B %d, %Y")}' \
 	"$(srcdir)" "$(srcdir)"/man/*.1
 
+HELP_EXTRA_TASKS = ""
+
 help: PHONY
 	$(MESSAGE_BEGIN) \
 	"                Makefile of Ruby" \
@@ -1498,7 +1500,7 @@ help: PHONY https://github.com/ruby/ruby/blob/trunk/#L1500
 	"  change:              make change log template" \
 	"  golf:                for golfers" \
 	"  goruby:              same as golf" \
-	"" \
+	$(HELP_EXTRA_TASKS) \
 	"see DeveloperHowto for more detail: " \
 	"  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \
 	$(MESSAGE_END)
diff --git a/defs/gmake.mk b/defs/gmake.mk
index e2e4a3b..80b9b34 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -209,6 +209,11 @@ fetch-github-%: https://github.com/ruby/ruby/blob/trunk/#L209
 pr-% merge-github-%: fetch-github-%
 	$(call merge-github,$*)
 
+HELP_EXTRA_TASKS = \
+	"  checkout-github:     checkout GitHub Pull Request [PR=1234]" \
+	"  merge-github:        merge GitHub Pull Request to current HEAD [PR=1234]" \
+	""
+
 ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
 extract-gems: update-gems
 endif
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/