summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-12-02 21:50:57 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2015-12-02 21:50:57 (GMT)
commit916d3c93559cdadf1ac7728ce0edd1dbebdf049b (patch)
treea75ee99f33f2c8716c3003fea36ee16d4afb7e79
parent1029f47a0be05d88b8ec1e3bcea94c79ad811917 (diff)
downloadscripts-916d3c93.zip
scripts-916d3c93.tar.gz
switch_all_submodules_to_head_and_clean: Use --rebase on git pull
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rwxr-xr-xswitch_all_submodules_to_head_and_clean2
1 files changed, 1 insertions, 1 deletions
diff --git a/switch_all_submodules_to_head_and_clean b/switch_all_submodules_to_head_and_clean
index 986dc0c..e41f550 100755
--- a/switch_all_submodules_to_head_and_clean
+++ b/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