diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-16 18:59:24 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-16 18:59:24 -0400 |
| commit | 9186c6413e7cdfc33527ca69d2e56dfec6d8b760 (patch) | |
| tree | fa3dc3f67e1ef6548669bd10a0ffa875fda8fe52 /release.template | |
| parent | d4a2145b63278706676158bc438c309887fb3edf (diff) | |
| download | gitblit-9186c6413e7cdfc33527ca69d2e56dfec6d8b760.tar.gz gitblit-9186c6413e7cdfc33527ca69d2e56dfec6d8b760.zip | |
Merge non-fast-forward for release branch merges
Diffstat (limited to 'release.template')
| -rw-r--r-- | release.template | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release.template b/release.template index a539c637..0fd61c56 100644 --- a/release.template +++ b/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} |