docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Specify git cherry-pick flags for release process.

Browse Source 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 6d470bb715d071cc91e51bb857099d0d90182ce2
Component: engine
This commit is contained in:
Andrew Hsu
2016-09-27 09:03:20 -07:00
parent 0cc382f1ee
commit db124038c0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/project/RELEASE-CHECKLIST.md
View File

@@ -71,8 +71,8 @@ We cherry-pick only the commits we want into the bump branch:
# 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>
git cherry-pick -s -x <commit-id>
git cherry-pick -s -x <commit-id>
...
```
@@ -340,7 +340,7 @@ Each time you'll want to produce a new release candidate, you will start by
adding commits to the branch, usually by cherry-picking from master:
```bash
git cherry-pick -x -m0 <commit_id>
git cherry-pick -s -x -m0 <commit_id>
```
You want your "bump commit" (the one that updates the CHANGELOG and VERSION
@@ -494,7 +494,7 @@ and you can check its progress with the CDN Cloudfront Chrome addon.
git checkout master
git fetch
git reset --hard origin/master
git cherry-pick $VERSION
git cherry-pick -s -x $VERSION
git push $GITHUBUSER merge_release_$VERSION
echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER:merge_release_$VERSION?expand=1"
```