Browse Source

switch_all_submodules_to_head_and_clean: Use --rebase on git pull

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 7 years ago
parent
commit
916d3c9355
  1. 2
      switch_all_submodules_to_head_and_clean

2
switch_all_submodules_to_head_and_clean

@ -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

Loading…
Cancel
Save