diff options
author | Michael Stapelberg <michael@stapelberg.de> | 2018-03-10 18:52:27 +0100 |
---|---|---|
committer | Michael Stapelberg <michael@stapelberg.de> | 2018-03-10 18:52:27 +0100 |
commit | 8513107f099ba4950bedfc72f4131177bc8bb2cd (patch) | |
tree | d4328a7c2555415906ed3b05e8803315789bf4f4 /release.sh | |
parent | e6b2fefe26b99b17a695ae130a8d0bc32fcf6e16 (diff) | |
download | i3-8513107f099ba4950bedfc72f4131177bc8bb2cd.tar.gz i3-8513107f099ba4950bedfc72f4131177bc8bb2cd.zip |
release: disable git’s rename protection (prevented merging)
Diffstat (limited to 'release.sh')
-rwxr-xr-x | release.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |