git pull with rebase

s/preview

@@ -25,7 +25,7 @@ cd $SOURCE
 rm -rf tolua
 git fetch || abort "failed to update source. do you have local changes?"
 [ -z $1 ] || git checkout $1
-git pull -q
+git pull --rebase -q
 git submodule update
 s/cmake-init
 s/build > /dev/null || abort "build failed."

s/pull

@@ -1,5 +0,0 @@
-#!/bin/sh
-if [ ! -z $1 ]; then
-  git checkout $1
-fi
-git pull && git submodule update

s/upgrade

@@ -7,7 +7,7 @@ while [ ! -d $ROOT/.git ]; do
 done
 
 cd $ROOT
-git pull
+git pull --rebase
 git submodule update
 s/build
 s/runtests