mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use git pull with rebase in build script

Browse source 
Without rebase, the build script would stop because it
couldn't complete a merge.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2015-07-12 14:42:18 +02:00 • committed by Dirk Hohndel
parent c41fd91261
commit 2847fb4af5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/build.sh
View file

@ -110,7 +110,7 @@ if [ ! -d libdivecomputer ] ; then
fi fi
fi fi
cd libdivecomputer cd libdivecomputer
git pull git pull --rebase
if ! git checkout Subsurface-testing ; then if ! git checkout Subsurface-testing ; then
echo "can't check out the Subsurface-testing branch of libdivecomputer -- giving up" echo "can't check out the Subsurface-testing branch of libdivecomputer -- giving up"
exit 1 exit 1
@ -134,7 +134,7 @@ if [ ! -d marble-source ] ; then
fi fi
fi fi
cd marble-source cd marble-source
git pull git pull --rebase
if ! git checkout Subsurface-testing ; then if ! git checkout Subsurface-testing ; then
echo "can't check out the Subsurface-testing branch of marble -- giving up" echo "can't check out the Subsurface-testing branch of marble -- giving up"
exit 1 exit 1