Skip to content

Commit

Permalink
Merge pull request #9 from tianon/vieux-hotfix-minor-nits
Browse files Browse the repository at this point in the history
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
  • Loading branch information
vieux committed Jul 9, 2014
2 parents 751c7e0 + e116686 commit 4634358
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions hack/RELEASE-CHECKLIST.md
Expand Up @@ -34,15 +34,16 @@ git checkout --track origin/release
git checkout -b bump_$VERSION
```

If it's a regular release, we usually merge master
If it's a regular release, we usually merge master.
```bash
git merge origin/master
```
Otherwise, if it is a hotfix release, we cherry-pick only the commits we want

Otherwise, if it is a hotfix release, we cherry-pick only the commits we want.
```bash
#get the commits ids we want to cherry-pick
# get the commits ids we want to cherry-pick
git log
#cherry-pick the commits starting from the oldest one, without including merge commits
# cherry-pick the commits starting from the oldest one, without including merge commits
git cherry-pick <commit-id>
git cherry-pick <commit-id>
...
Expand Down

0 comments on commit 4634358

Please sign in to comment.