Merge pull request #10944 from zmerlynn/fix-consistency
Brendan noticed this silly inconsistency.
This commit is contained in:
@@ -113,7 +113,7 @@ if git remote -v | grep ^origin | grep GoogleCloudPlatform/kubernetes.git; then
|
||||
echo
|
||||
echo "where REMOTE is your personal fork (maybe 'upstream'? Consider swapping those.)."
|
||||
echo "Then propose ${NEWBRANCH} as a pull against ${BRANCH} (NOT MASTER)."
|
||||
echo "Use this exact subject: 'Autogenerated cherry-pick of #${PULL}' and include a justification."
|
||||
echo "Use this exact subject: 'Automated cherry pick of #${PULL}' and include a justification."
|
||||
cleanbranch=""
|
||||
exit 0
|
||||
fi
|
||||
@@ -133,5 +133,5 @@ git push origin -f "${NEWBRANCHUNIQ}:${NEWBRANCH}"
|
||||
|
||||
echo
|
||||
echo "+++ Now you must propose ${NEWBRANCH} as a pull against ${BRANCH} (NOT MASTER)."
|
||||
echo " You must use this exact subject: 'Autogenerated cherry-pick of #${PULL}' and include a justification."
|
||||
echo " You must use this exact subject: 'Automated cherry pick of #${PULL}' and include a justification."
|
||||
echo
|
||||
|
Reference in New Issue
Block a user