kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #6916 from vieux/update_release_checklist_hotfix

Browse source 
Add hotfix help to the release checklist
This commit is contained in:
Tianon Gravi 2014-07-09 07:50:38 -06:00
commit 65a5dde38b
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hack/RELEASE-CHECKLIST.md
View file

@ -32,9 +32,23 @@ git fetch origin
git branch -D release || true
git checkout --track origin/release
git checkout -b bump_$VERSION
```
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.
```bash
# get the commits ids we want to cherry-pick
git log
# cherry-pick the commits starting from the oldest one, without including merge commits
git cherry-pick <commit-id>
git cherry-pick <commit-id>
...
```
### 2. Update CHANGELOG.md
You can run this command for reference with git 2.0: