Merge pull request #3864 from allanrenucci/master

 Merge branch '0.5.x' into `master`

Author: OlivierBlanvillain

project/scripts/ci-clone

@@ -5,7 +5,7 @@ set -eux
 if [ "$DRONE_BUILD_EVENT" = "pull_request" ]; then
   git config user.email "[email protected]"
   git config user.name "Allan Renucci"
-  git pull --rebase "$DRONE_REMOTE_URL" "$DRONE_BRANCH"
+  git pull "$DRONE_REMOTE_URL" "$DRONE_BRANCH"
 fi
 
 # clone submodules in parallel