github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10944 from zmerlynn/fix-consistency

Browse Source 
Brendan noticed this silly inconsistency.
This commit is contained in:
Brendan Burns 2015-07-08 11:54:52 -07:00
commit be36fac84f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/cherry_pick_pull.sh
View File

@ -113,7 +113,7 @@ if git remote -v | grep ^origin | grep GoogleCloudPlatform/kubernetes.git; then
echo echo
echo "where REMOTE is your personal fork (maybe 'upstream'? Consider swapping those.)." echo "where REMOTE is your personal fork (maybe 'upstream'? Consider swapping those.)."
echo "Then propose ${NEWBRANCH} as a pull against ${BRANCH} (NOT MASTER)." 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="" cleanbranch=""
exit 0 exit 0
fi fi
@ -133,5 +133,5 @@ git push origin -f "${NEWBRANCHUNIQ}:${NEWBRANCH}"
echo echo
echo "+++ Now you must propose ${NEWBRANCH} as a pull against ${BRANCH} (NOT MASTER)." 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 echo