From 727597474c6bac2d7c692ed86d5367f6e435a4c5 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 4 Nov 2013 16:46:21 +0100
Subject: update --master: use git pull --rebase.

---
 update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/update b/update
index b8b14cb..063243a 100755
--- a/update
+++ b/update
@@ -13,7 +13,7 @@ do_gitmaster()
 {
 	set -ex
 	git submodule foreach 'git checkout master'
-	git submodule foreach 'git pull'
+	git submodule foreach 'git pull --rebase'
 	git submodule foreach 'git remote prune origin'
 }
 
@@ -40,7 +40,7 @@ do_releasetag()
 if [ x"$1" != x"--skip-selfupdate" ]; then
 	(
 		set -ex
-		git pull
+		git pull --rebase
 	)
 	exec "$0" --skip-selfupdate "$@"
 fi
-- 
cgit v1.2.3