зеркало из https://github.com/microsoft/docker.git
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:
Родитель
751c7e0f00
Коммит
e1166861d2
|
@ -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>
|
||||
...
|
||||
|
|
Загрузка…
Ссылка в новой задаче