merging with local master

post-commit

@@ -9,7 +9,7 @@ if [ "$version" != "" ]; then
   git tag -a "v$version" -m "`git log -1 --format=%s`"
   echo "Created a new tag, v$version"
   git checkout production
-  git merge origin/master
+  git merge master
   git push origin production && git push origin production --tags
   git checkout master
 fi