From: Henrik Brautaset Aronsen <subsurf...@henrik.synth.no> Without rebase, the build script would stop because it couldn't complete a merge. --- scripts/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh index 7b54bea..cb9b4ad 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -77,7 +77,7 @@ if [ ! -d libgit2 ] ; then fi cd libgit2 # let's build with a recent enough version of master for the latest features -git pull origin master +git pull --rebase origin master if ! git checkout c11daac9de2 ; then echo "Can't find the right commit in libgit2 - giving up" exit 1 @@ -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 -- 2.4.1 _______________________________________________ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface