add no-edit to release merge

jivesoftware · Jul 5, 2016 · 7bc5217 · 7bc5217
1 parent 3043766
commit 7bc5217
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/release.sh b/release.sh
@@ -72,7 +72,7 @@ fi
 
 git checkout master
 git pull
-git merge ${ON_BRANCH}
+git merge --no-edit ${ON_BRANCH}
 if [ "$?" -ne "0" ]; then
 	echo "Failed to merge to master."
 	exit 1