From 751c7e0f003e27d7c862ff91ca85f300bfcbf2cc Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Tue, 8 Jul 2014 23:09:22 +0000
Subject: [PATCH 1/2] add hotfix help

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (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 2fe1a3ce9..1930b217d 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 <commit-id>
+git cherry-pick <commit-id>
+...
+```
 
 ### 2. Update CHANGELOG.md
 

From e1166861d28121b0e389c913de9d0f4faf8f33d8 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 8 Jul 2014 19:53:08 -0600
Subject: [PATCH 2/2] Update RELEASE-CHECKLIST with a few minor nits (periods,
 whitespace)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
---
 hack/RELEASE-CHECKLIST.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hack/RELEASE-CHECKLIST.md b/hack/RELEASE-CHECKLIST.md
index 1930b217d..ea826512c 100644
--- a/hack/RELEASE-CHECKLIST.md
+++ b/hack/RELEASE-CHECKLIST.md
@@ -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>
 ...