Whoops, remove now-invalid code in setColors_.

[dygraphs.git] / release.sh

diff --git a/release.sh b/release.sh
index a945999..01089e4 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -59,7 +59,7 @@ echo "Pushing the new version to dygraphs.com..."
 
 echo "Success!\n"
 echo "Don't forget to merge changes on this branch back into master:"
-echo "git merge $branch"
+echo "git merge --no-ff $branch"
 
 # Discourage users from working on the "releases" branch.
 git checkout master