From 751c7e0f003e27d7c862ff91ca85f300bfcbf2cc Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 8 Jul 2014 23:09:22 +0000 Subject: [PATCH] add hotfix help Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- hack/RELEASE-CHECKLIST.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hack/RELEASE-CHECKLIST.md b/hack/RELEASE-CHECKLIST.md index 2fe1a3ce96..1930b217d9 100644 --- a/hack/RELEASE-CHECKLIST.md +++ b/hack/RELEASE-CHECKLIST.md @@ -32,8 +32,21 @@ 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 +git cherry-pick +... +``` ### 2. Update CHANGELOG.md