diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2015-07-12 14:42:18 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-12 13:58:17 -0700 |
| commit | 2847fb4af5bfee3b73014fa3fb4d50927b42cfb7 (patch) | |
| tree | 023a80e85341f452b13a7ae7c8f9a6c14d5cb816 /scripts/build.sh | |
| parent | c41fd9126125e58932f45919f57462f13b21760e (diff) | |
| download | subsurface-2847fb4af5bfee3b73014fa3fb4d50927b42cfb7.tar.gz | |
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 <dirk@hohndel.org>
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 |