From 404589d9b5240314086b7df56315b8d63982cfe7 Mon Sep 17 00:00:00 2001
From: Zeke Sikelianos <zeke@sikelianos.com>
Date: Thu, 10 Aug 2017 09:26:22 -0700
Subject: [PATCH 1/2] add more releasing tips

---
 docs/development/releasing.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/development/releasing.md b/docs/development/releasing.md
index 3123b97c3cf1..20665249094b 100644
--- a/docs/development/releasing.md
+++ b/docs/development/releasing.md
@@ -2,11 +2,25 @@
 
 This document describes the process for releasing a new version of Electron.
 
+## Create a backport branch
+
+If you're about release a new major or minor version of Electron like `1.8.0`, 
+`1.9.0`, or `2.0.0`, first create a branch of `master` for later backports:
+
+Assuming you're about to publish `1.8.0`:
+
+```sh
+git checkout master
+git pull
+git checkout -b 1-7-x
+git push origin HEAD
+```
+
 ## Create a temporary branch
 
 Create a new branch from `master`. Name it `release` or anything you like.
 
-Note: If you are creating a backport release, you'll check out `1-6-x`, `1-7-x`, etc instead of `master`. 
+Note: If you are creating a backport release, you'll check out `1-6-x`, `1-7-x`, etc instead of `master`.
 
 ```sh
 git checkout master
@@ -126,10 +140,11 @@ This release is published to [npm](https://www.npmjs.com/package/electron) under
 
 ## Merge temporary branch
 
-Merge the temporary back into master, without creating a merge commit:
+Merge the temporary branch back into master, without creating a merge commit:
 
 ```sh
-git merge release master --no-commit
+git checkout master
+git merge release --no-commit
 git push origin master
 ```
 

From 88b3109137d8c226dd38e0c237d1ef8810fceb23 Mon Sep 17 00:00:00 2001
From: Zeke Sikelianos <zeke@sikelianos.com>
Date: Tue, 22 Aug 2017 21:03:03 -0700
Subject: [PATCH 2/2] change backport branch creation steps

---
 docs/development/releasing.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/development/releasing.md b/docs/development/releasing.md
index 20665249094b..c492896f28c3 100644
--- a/docs/development/releasing.md
+++ b/docs/development/releasing.md
@@ -5,14 +5,14 @@ This document describes the process for releasing a new version of Electron.
 ## Create a backport branch
 
 If you're about release a new major or minor version of Electron like `1.8.0`, 
-`1.9.0`, or `2.0.0`, first create a branch of `master` for later backports:
+`1.9.0`, or `2.0.0`, first create a branch from the most recent minor release 
+for later backports:
 
-Assuming you're about to publish `1.8.0`:
+Assuming you're about to publish `1.8.0`, and the highest `1.7` release was
+`1.7.6`:
 
 ```sh
-git checkout master
-git pull
-git checkout -b 1-7-x
+git checkout -b 1-7-x v1.7.6
 git push origin HEAD
 ```