From 94b5f2dadbcb9f0aba72300826dae062cf75a131 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Thu, 19 Dec 2013 15:47:16 -0800
Subject: chore(release): improve the release script

---
 scripts/jenkins/bump-remove-snapshot.sh |  2 +-
 scripts/jenkins/release.sh              | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/jenkins/bump-remove-snapshot.sh b/scripts/jenkins/bump-remove-snapshot.sh
index fb7c79b9..9fafb334 100755
--- a/scripts/jenkins/bump-remove-snapshot.sh
+++ b/scripts/jenkins/bump-remove-snapshot.sh
@@ -16,5 +16,5 @@ echo "-- local version: $VERSION"
 
 echo "-- commit and tag with v$VERSION"
 git add package.json
-git commit -m "chore(release): v$VERSION"
+git commit -m "chore(release): cut v$VERSION release"
 git tag -m "v$VERSION" v$VERSION
diff --git a/scripts/jenkins/release.sh b/scripts/jenkins/release.sh
index 444f5bdd..e3d3a708 100755
--- a/scripts/jenkins/release.sh
+++ b/scripts/jenkins/release.sh
@@ -12,6 +12,12 @@ BUMP_TYPE=$1
 
 # Enable tracing and exit on first failure
 set -xe
+
+# Jump onto the master branch and make sure we are using the latest
+git checkout -f master
+git merge --ff-only origin/master
+
+
 # Normalize working dir to script dir
 cd `dirname $0`/../..
 
@@ -27,12 +33,10 @@ cd `dirname $0`/../..
 
 echo "-- push to Github"
 # push to github
-git push
+git push --all
 
 # Update code.angularjs.org
 ./scripts/code.angularjs.org/publish.sh
 
 # Update bower
 ./scripts/bower/publish.sh
-
-
-- 
cgit v1.2.3