History

Sahdev P. Zala 78fb1e34f8 hack: fix cherrypick instruction Remotes is not a valid git command. Also, set the environmental variable correctly.		2019-09-15 17:48:04 -04:00
..
README.md	hack: fix cherrypick instruction	2019-09-15 17:48:04 -04:00
cherrypick.sh	*: update github.com links	2018-08-28 17:47:56 -07:00

README.md

./hack/patch/cherrypick.sh

Handles cherry-picks of PR(s) from etcd master to a stable etcd release branch automatically.

Setup

Set the UPSTREAM_REMOTE and FORK_REMOTE environment variables. UPSTREAM_REMOTE should be set to git remote name of github.com/etcd-io/etcd, and FORK_REMOTE should be set to the git remote name of the forked etcd repo (github.com/${github-username}/etcd). Use git remote -v to look up the git remote names. If etcd has not been forked, create one on github.com and register it locally with git remote add ....

export UPSTREAM_REMOTE=upstream
export FORK_REMOTE=origin
export GITHUB_USER=${github-username}

Next, install hub from https://github.com/github/hub

Usage

To cherry pick PR 12345 onto release-3.2 and propose is as a PR, run:

./hack/patch/cherrypick.sh ${UPSTREAM_REMOTE}/release-3.2 12345

To cherry pick 12345 then 56789 and propose them togther as a single PR, run:

./hack/patch/cherrypick.sh ${UPSTREAM_REMOTE}/release-3.2 12345 56789