From 35bb2253c9ff0dcc44f3245026a141fde6415153 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 19:03:46 -0400
Subject: [PATCH] Merge non-fast-forward for release branch merges
---
release.template | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/release.template b/release.template
index a539c63..0fd61c5 100644
--- a/release.template
+++ b/release.template
@@ -64,7 +64,7 @@
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 "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
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 "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}
--
Gitblit v1.9.1