From: Dan Vanderkam <danvdk@gmail.com>
Date: Thu, 29 Aug 2013 23:17:42 +0000 (-0400)
Subject: suggest merge command in release.sh
X-Git-Tag: v1.1.0~90
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=00179556c038e85a6059c1393fcf2b72d1481414;p=dygraphs.git

suggest merge command in release.sh
---

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