Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-07-08 19:53:08 -06:00
Родитель 751c7e0f00
Коммит e1166861d2
1 изменённых файлов: 5 добавлений и 4 удалений

Просмотреть файл

@ -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>
... ...