aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmakerelease2
1 files changed, 1 insertions, 1 deletions
diff --git a/makerelease b/makerelease
index 7ae0976..86851e1 100755
--- a/makerelease
+++ b/makerelease
@@ -106,6 +106,6 @@ rm -R .build
if [ ! "$branch" = "master" ]; then
git checkout $branch
- git pull
+ git merge master
git push
fi