From ba1b99c74525da1f80970e7916f06112805b59f2 Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Mon, 6 Oct 2014 10:51:37 -0700 Subject: [PATCH] Re-add checkout command to update-master task --- makefile.shade | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile.shade b/makefile.shade index 7ae73905e5..684dd56ef5 100644 --- a/makefile.shade +++ b/makefile.shade @@ -139,6 +139,7 @@ functions var gitFolder = '${repo}' git gitCommand='fetch origin' + git gitCommand='checkout origin/master -B master' git gitCommand='merge origin/release --ff-only' git gitCommand='push origin master:master'