diff options
Diffstat (limited to 'switch_all_submodules_to_head_and_clean')
| -rwxr-xr-x | switch_all_submodules_to_head_and_clean | 2 |
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 |