X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=release.sh;h=fb017bb17437bd1b502a446309f7e8e555f9e01b;hp=cfb4beae4c6357e0db7e3bb114f9a01bee1665a3;hb=8513107f099ba4950bedfc72f4131177bc8bb2cd;hpb=e6b2fefe26b99b17a695ae130a8d0bc32fcf6e16

diff --git a/release.sh b/release.sh
index cfb4beae..fb017bb1 100755
--- a/release.sh
+++ b/release.sh
@@ -85,12 +85,12 @@ if [ "${RELEASE_BRANCH}" = "master" ]; then
 	git checkout master
 	git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
 	git checkout next
-	git merge --no-ff -X ours master -m "Merge branch 'master' into next"
+	git merge --no-ff -s recursive -X ours -X no-renames master -m "Merge branch 'master' into next"
 else
 	git checkout next
 	git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
 	git checkout master
-	git merge --no-ff -X theirs next -m "Merge branch 'next' into master"
+	git merge --no-ff -s recursive -X theirs -X no-renames next -m "Merge branch 'next' into master"
 fi
 
 git remote remove origin