diff --git a/auto-update.sh b/auto-update.sh
index e3c345e99..84f5d55d2 100755
--- a/auto-update.sh
+++ b/auto-update.sh
@@ -8,7 +8,7 @@ git add .
 git diff --quiet --exit-code --cached || git commit -m 'bla'
 ls
 git pull origin master
-git merge master
+git rebase master
 
 echo npm install for good measure
 /usr/local/bin/npm install