diff options
Diffstat (limited to 'scripts/build.sh')
| -rwxr-xr-x | scripts/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |