From 6d1a6c52315c412fd4b2627c164896b6ea78e205 Mon Sep 17 00:00:00 2001
From: Brice Lambson <bricelam@microsoft.com>
Date: Mon, 6 Oct 2014 10:35:32 -0700
Subject: [PATCH] Add update-master target

---
 makefile.shade | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/makefile.shade b/makefile.shade
index 574791e9f7..7ae73905e5 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -132,20 +132,15 @@ functions
         }
     }
 
-#reset-master
-    -// Resets master branch to release
+#update-master
+    -// Merge release branch to master
     for each='var repo in GetAllRepos()'
         -CloneOrUpdate(repo);
 
         var gitFolder = '${repo}'
         git gitCommand='fetch origin'
-        git gitCommand='checkout origin/release -B master'
-
-#push-master
-    -// Resets master branch to release
-    for each='var repo in GetAllRepos()'
-        var gitFolder = '${repo}'
-        git gitCommand='push origin master:master -f'
+        git gitCommand='merge origin/release --ff-only'
+        git gitCommand='push origin master:master'
 
 #only-compile target='compile'
     @{