File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -116,7 +116,7 @@ if test $BRANCH != "master" && test $BRANCH != "next"; then
116
116
# Common case: Releasing from a branch, e.g. stable-9999, fixes
117
117
echo " Merging active branch $BRANCH back into master."
118
118
git checkout master
119
- git merge --ff-only $TAG || exit 7
119
+ git merge -S - -ff-only $TAG || exit 7
120
120
121
121
# Then offer to delete it.
122
122
echo " Delete branch $BRANCH ? [y/N]"
@@ -131,12 +131,12 @@ if test $BRANCH != "master" && test $BRANCH != "next"; then
131
131
132
132
# Merge master into next.
133
133
git checkout next
134
- git merge master
134
+ git merge -S master
135
135
elif test $BRANCH == " next" ; then
136
136
# Releasing from next.
137
137
# Merge next into master.
138
138
git checkout master
139
- git merge next
139
+ git merge -S next
140
140
fi
141
141
142
142
# Push changes and end on next.
You can’t perform that action at this time.
0 commit comments