Update update.php

rickbot-dot · Jul 10, 2023 · c74f205 · c74f205
1 parent e29a64a
commit c74f205
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/maintenance/update.php b/maintenance/update.php
@@ -8,6 +8,6 @@
 chdir(dirname(__DIR__));
 shell_exec("COMPOSER_ALLOW_SUPERUSER=1 composer update");
 echo "Pulling git changes...\n";
-shell_exec("git pull");
+shell_exec("git pull --no-rebase");
 chdir("maintenance");
 echo "Update finished!\n";