diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-12-02 22:50:57 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-02 22:57:29 +0100 |
| commit | 6d53459401fc15137b68432053bdea3c3c7d0ec2 (patch) | |
| tree | 68c439c0733a87f294abbd450cde30e1dfb69aa4 | |
| parent | 5097cbe74c73428f2e5f3c536a1a6f71daeb58b8 (diff) | |
| download | scripts-6d53459401fc15137b68432053bdea3c3c7d0ec2.tar.gz scripts-6d53459401fc15137b68432053bdea3c3c7d0ec2.zip | |
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 916d3c93559cdadf1ac7728ce0edd1dbebdf049b)
| -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 |