release: disable git’s rename protection (prevented merging)

[i3/i3] / release.sh

diff --git a/release.sh b/release.sh
index cfb4beae4c6357e0db7e3bb114f9a01bee1665a3..fb017bb17437bd1b502a446309f7e8e555f9e01b 100755 (executable)
--- 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