X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=release.sh;h=01089e4865deb5b17315bacb194f59568f74b386;hb=94647da23ed251ba0f1da8d155d2552680a4e9cf;hp=a94599942a4ff7fa0233020e3e9b733e6cdb4b65;hpb=9023a6d6bddd368690ec999ba919dbf1e48a4002;p=dygraphs.git

diff --git a/release.sh b/release.sh
index a945999..01089e4 100755
--- 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