summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Loafman <zml@google.com>2015-07-11 17:00:20 -0700
committerZach Loafman <zml@google.com>2015-07-13 07:11:12 -0700
commiteed049cf8d255fd787d10565e8700ba5cd296750 (patch)
treec4ea153b529ca298c0ce1eb9ae3bc02890ff6ffc
parent3a38ce4217962abf1ebd37e08ea51c5c857de70e (diff)
hack/cherry_pick_pull.sh: Allow multiple pulls
Reorder the arguments to allow for multiple pulls at the end: hack/cherry_pick_pull.sh <remote branch> <pr-number>... This solves some common A-then-immediate-A' cases that appear frequently on head. (There's a workaround, but it's a hack.) Updates the documentation.
-rw-r--r--cherry-picks.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/cherry-picks.md b/cherry-picks.md
index 5fbada99..2708db93 100644
--- a/cherry-picks.md
+++ b/cherry-picks.md
@@ -8,7 +8,7 @@ Kubernetes projects.
Any contributor can propose a cherry pick of any pull request, like so:
```
-hack/cherry_pick_pull.sh 98765 upstream/release-3.14
+hack/cherry_pick_pull.sh upstream/release-3.14 98765
```
This will walk you through the steps to propose an automated cherry pick of pull