From d8a824631c0a63c3cc9fe71bad536941c67122b1 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 10 Aug 2020 13:11:19 +0200
Subject: [PATCH] git pull with rebase

---
 s/preview | 2 +-
 s/pull    | 5 -----
 s/upgrade | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100755 s/pull

diff --git a/s/preview b/s/preview
index 2fde22cda..717737a02 100755
--- a/s/preview
+++ b/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."
diff --git a/s/pull b/s/pull
deleted file mode 100755
index fa3167c5b..000000000
--- a/s/pull
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-if [ ! -z $1 ]; then
-  git checkout $1
-fi
-git pull && git submodule update
diff --git a/s/upgrade b/s/upgrade
index 9d9d5a313..e7b91196b 100755
--- a/s/upgrade
+++ b/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