Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
| ... | ... |
@@ -71,8 +71,8 @@ We cherry-pick only the commits we want into the bump branch: |
| 71 | 71 |
# get the commits ids we want to cherry-pick |
| 72 | 72 |
git log |
| 73 | 73 |
# cherry-pick the commits starting from the oldest one, without including merge commits |
| 74 |
-git cherry-pick <commit-id> |
|
| 75 |
-git cherry-pick <commit-id> |
|
| 74 |
+git cherry-pick -s -x <commit-id> |
|
| 75 |
+git cherry-pick -s -x <commit-id> |
|
| 76 | 76 |
... |
| 77 | 77 |
``` |
| 78 | 78 |
|
| ... | ... |
@@ -340,7 +340,7 @@ Each time you'll want to produce a new release candidate, you will start by |
| 340 | 340 |
adding commits to the branch, usually by cherry-picking from master: |
| 341 | 341 |
|
| 342 | 342 |
```bash |
| 343 |
-git cherry-pick -x -m0 <commit_id> |
|
| 343 |
+git cherry-pick -s -x -m0 <commit_id> |
|
| 344 | 344 |
``` |
| 345 | 345 |
|
| 346 | 346 |
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. |
| 494 | 494 |
git checkout master |
| 495 | 495 |
git fetch |
| 496 | 496 |
git reset --hard origin/master |
| 497 |
-git cherry-pick $VERSION |
|
| 497 |
+git cherry-pick -s -x $VERSION |
|
| 498 | 498 |
git push $GITHUBUSER merge_release_$VERSION |
| 499 | 499 |
echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER:merge_release_$VERSION?expand=1" |
| 500 | 500 |
``` |