diff options
| author | Zach Loafman <zml@google.com> | 2015-07-09 14:24:02 -0700 |
|---|---|---|
| committer | Zach Loafman <zml@google.com> | 2015-07-09 14:35:26 -0700 |
| commit | 4b1d27f1ee0de2e4fdbd83286aea851ad5b29a4c (patch) | |
| tree | 41517fe30876bd35dc6877de571f1956cbee19c3 | |
| parent | 2fe55a7351c1beb2e07ed9ab470500737d08527f (diff) | |
Add a short doc on cherry picks
| -rw-r--r-- | cherry-picks.md | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/cherry-picks.md b/cherry-picks.md new file mode 100644 index 00000000..b6669110 --- /dev/null +++ b/cherry-picks.md @@ -0,0 +1,32 @@ +# Overview + +This document explains cherry picks are managed on release branches within the +Kubernetes projects. + +## Propose a Cherry Pick + +Any contributor can propose a cherry pick of any pull request, like so: + +``` +hack/cherry_pick_pull.sh 98765 upstream/release-3.14 +``` + +This will walk you through the steps to propose an automated cherry pick of pull + #98765 for remote branch `upstream/release-3.14`. + +## Cherry Pick Review + +Cherry pick pull requests are reviewed differently than normal pull requests. In +particular, they may be self-merged by the release branch owner without fanfare, +in the case the release branch owner knows the cherry pick was already +requested - this should not be the norm, but it may happen. + +[Contributor License Agreements](../../CONTRIBUTING.md) is considered implicit +for all code within cherry-pick pull requests, ***unless there is a large +conflict***. + +## Searching for Cherry Picks + +Now that we've structured cherry picks as PRs, searching for all cherry-picks +against a release is a GitHub query: For example, +[this query is all of the v0.21.x cherry-picks](https://github.com/GoogleCloudPlatform/kubernetes/pulls?utf8=%E2%9C%93&q=is%3Apr+%22automated+cherry+pick%22+base%3Arelease-0.21) |