From 2847fb4af5bfee3b73014fa3fb4d50927b42cfb7 Mon Sep 17 00:00:00 2001 From: Henrik Brautaset Aronsen Date: Sun, 12 Jul 2015 14:42:18 +0200 Subject: Use git pull with rebase in build script Without rebase, the build script would stop because it couldn't complete a merge. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 7b54beaee..b18b1197d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -110,7 +110,7 @@ if [ ! -d libdivecomputer ] ; then fi fi cd libdivecomputer -git pull +git pull --rebase if ! git checkout Subsurface-testing ; then echo "can't check out the Subsurface-testing branch of libdivecomputer -- giving up" exit 1 @@ -134,7 +134,7 @@ if [ ! -d marble-source ] ; then fi fi cd marble-source -git pull +git pull --rebase if ! git checkout Subsurface-testing ; then echo "can't check out the Subsurface-testing branch of marble -- giving up" exit 1 -- cgit v1.2.3-70-g09d2