switch_all_submodules_to_head_and_clean: Use --rebase on git pull

Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 916d3c9355)
9 years ago · 24b5078acd
parent 8cf95ae5ad
commit 24b5078acd
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -44,7 +44,7 @@ if [[ ! -z "`git status --porcelain $GIT_IGNORE_SUBMODULES`" ]]; then
 	git reset --hard HEAD
 	git clean -dxff
 fi
-git pull
+git pull --rebase
 if [[ ! -z "`git status --porcelain $GIT_IGNORE_SUBMODULES`" ]]; then
 	git reset --hard HEAD
 	git clean -dxff