docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from tianon/vieux-hotfix-minor-nits 

Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
This commit is contained in:
Victor Vieux 2014-07-09 00:57:03 -07:00
parent 751c7e0f00 e1166861d2
commit 463435827b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/RELEASE-CHECKLIST.md
View File

@ -34,15 +34,16 @@ git checkout --track origin/release
git checkout -b bump_$VERSION 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 ```bash
git merge origin/master 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 ```bash
#get the commits ids we want to cherry-pick # get the commits ids we want to cherry-pick
git log 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>
git cherry-pick <commit-id> git cherry-pick <commit-id>
... ...