From 00179556c038e85a6059c1393fcf2b72d1481414 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Thu, 29 Aug 2013 19:17:42 -0400 Subject: [PATCH] suggest merge command in release.sh --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.7.4