diff --git a/scripts/upgrade b/scripts/upgrade index 84db87e..ad39c54 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,6 +77,7 @@ then pushd "$install_dir" chown -R "$app:www-data" "$install_dir" git config --system --add safe.directory "$install_dir" + git config pull.rebase false ynh_exec_as "$app" git fetch #git checkout master