From: Dan Vanderkam <danvdk@gmail.com>
Date: Thu, 29 Aug 2013 22:55:05 +0000 (-0400)
Subject: Merge branch 'release-1.0.1'
X-Git-Tag: v1.1.0~92
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=023b7bd44183090c18e450fbd717ad933fac2e41;hp=802b882080f865d36b471e6c011841d86ec79d82;p=dygraphs.git

Merge branch 'release-1.0.1'
---

diff --git a/release.sh b/release.sh
index 87bcc1d..c92db4f 100755
--- a/release.sh
+++ b/release.sh
@@ -42,7 +42,12 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-# Everything is good. Tag this release and push it.
+# Everything is good.
+# Switch to the "releases" branch, merge this change and tag it.
+echo "Switching branches to do the release."
+git checkout releases
+git merge --no-ff $branch
+
 COMMIT=$(git rev-parse HEAD)
 echo "Tagging commit $COMMIT as version $VERSION"
 git tag -a "v$VERSION" -m "Release of version $VERSION"
@@ -50,3 +55,6 @@ git push --tags
 
 echo "Release was successful!"
 echo "Don't forget to merge changes on this branch back into master."
+
+# Discourage users from working on the "releases" branch.
+git checkout master