From a44ea7c8c7fc9beab3b4bffe26639aa6b15c230c Mon Sep 17 00:00:00 2001 From: Tim Pepper Date: Mon, 16 Sep 2019 09:49:56 -0700 Subject: [PATCH] reference cherry pick process in hack script The documentation on the cherry pick process has seen improvements lately, but that isn't highly discoverable. This commit attempts to make that information more visible. Signed-off-by: Tim Pepper --- hack/cherry_pick_pull.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/cherry_pick_pull.sh b/hack/cherry_pick_pull.sh index af9cb5c5e28..b8b89cf9f5b 100755 --- a/hack/cherry_pick_pull.sh +++ b/hack/cherry_pick_pull.sh @@ -64,8 +64,10 @@ if [[ "$#" -lt 2 ]]; then echo " Set the REGENERATE_DOCS environment var to regenerate documentation for the target branch after picking the specified commits." echo " This is useful when picking commits containing changes to API documentation." echo - echo " Set UPSTREAM_REMOTE (default: upstream) and FORK_REMOTE (default: origin)" - echo " To override the default remote names to what you have locally." + echo " Set UPSTREAM_REMOTE (default: upstream) and FORK_REMOTE (default: origin)" + echo " to override the default remote names to what you have locally." + echo + echo " For merge process info, see https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md" exit 2 fi @@ -151,6 +153,8 @@ Automated cherry pick of ${numandtitle} Cherry pick of ${PULLSUBJ} on ${rel}. ${numandtitle} + +For details on the cherry pick process, see the [cherry pick requests](https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md) page. EOF hub pull-request -F "${prtext}" -h "${GITHUB_USER}:${NEWBRANCH}" -b "${MAIN_REPO_ORG}:${rel}"