Skip to content

Commit

Permalink
hack/patch: fix some typos in README, make cherrypick.sh executable
Browse files Browse the repository at this point in the history
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
  • Loading branch information
gyuho committed Nov 30, 2017
1 parent 66a9508 commit 39a8371
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hack/patch/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# hack/cherrypick.sh
# ./hack/patch/cherrypick.sh

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

Expand All @@ -24,13 +24,13 @@ Next, install hub from https://github.com/github/hub
To cherry pick PR 12345 onto release-2.22 and propose is as a PR, run:

```sh
hack/cherrypick.sh upstream/release-2.2 12345
./hack/patch/cherrypick.sh upstream/release-2.2 12345
```

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

```
hack/cherrypick.sh upstream/release-2.2 12345 56789
./hack/patch/cherrypick.sh upstream/release-2.2 12345 56789
```


Empty file modified hack/patch/cherrypick.sh
100644 → 100755
Empty file.

0 comments on commit 39a8371

Please sign in to comment.