cronjob.sh

@@ -12,7 +12,7 @@ echo "*** Running cronjob @ `date` ***"
 cd $DIR
 
 # Pull any updates, and if the project is already up to date, exit successfully.
-git pull | grep -v "up to date"
+git pull --rebase | grep -v "up to date"
 status="$?"
 echo "* Pull status is '$status'."
 if [[ $status != 0 ]]; then