diff options
author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-10-01 01:25:41 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-10-01 01:25:41 +0200 |
commit | 57b682d63e3a1e331aec58648e78731ec74714f4 (patch) | |
tree | 4161f2265b4cd27e01f7ccfa85442bd8ea9fe2ea | |
parent | cb098683a69a0203ab58836be80da94705abf0cd (diff) |
coverity: favor upstream for conflicts during pull
An upstream branch rebase caused a merge conflict on the build server
recently. This hopefully avoids that next time.
Change-Id: Ib9f48b3b2283d1b8d1a79d42732d935236a2b1c9
-rwxr-xr-x | coverity/build_iuh.sh | 2 | ||||
-rwxr-xr-x | coverity/coverity_all.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coverity/build_iuh.sh b/coverity/build_iuh.sh index 1374ebb..d9a86a4 100755 --- a/coverity/build_iuh.sh +++ b/coverity/build_iuh.sh @@ -14,7 +14,7 @@ do_build() { git clean -dxf git checkout . git remote prune origin - git pull --rebase + git pull --rebase -s recursive -Xtheirs autoreconf --install --force ./configure --prefix="$prefix" $* diff --git a/coverity/coverity_all.sh b/coverity/coverity_all.sh index fba5271..67f52c5 100755 --- a/coverity/coverity_all.sh +++ b/coverity/coverity_all.sh @@ -14,7 +14,7 @@ export PKG_CONFIG_PATH="$prefix/lib/pkgconfig" do_build() { git clean -dxf git remote prune origin - git pull --rebase + git pull --rebase -s recursive -Xtheirs autoreconf --install --force ./configure --prefix="$prefix" $* |