Browse Source

only fast-forward

Jeroen De Meerleer 1 month ago
parent
commit
db0306e0cc
1 changed files with 2 additions and 2 deletions
  1. 2 2
      files/update.sh

+ 2 - 2
files/update.sh

@@ -14,13 +14,13 @@ cd ${webroot}
 bash bin/console maintenance 1
 
 ## Core update
-git pull
+git pull --ff-only
 php bin/composer.phar install --optimize-autoloader --no-dev
 bash bin/console dbstructure update
 
 ## Addon update
 cd addon
-git pull
+git pull --ff-only
 
 ## finalize
 cd ${webroot}