Merge non-fast-forward for release branch merges

release.template

@@ -64,7 +64,7 @@ echo "Merging release ${project.version} to master"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout master
-git merge -m "Merge release ${project.version}" ${project.commitId}
+git merge --no-ff -m "Merge release ${project.version}" ${project.commitId}
 ant nextPointReleaseCycle
 
 # merge to develop
@@ -74,7 +74,7 @@ echo "Merging release ${project.version} to develop"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout develop
-git merge -m "Merge release ${project.version}" ${project.commitId}
+git merge --no-ff -m "Merge release ${project.version}" ${project.commitId}
 ant nextMinorReleaseCycle
 
 # push Maven repository to origin
@@ -93,4 +93,4 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Pushing master, develop, gh-pages, and tag ${project.tag}"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
-git push origin master develop gh-pages tag ${project.tag}
+git push origin master develop gh-pages ${project.tag}