X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=web-update-server;h=2c36d71009d06ae382d18ea15b310782ca7a4fbe;hb=de19adb392eb02bd0ad0ef75ddf8ae2e7f5748ce;hp=23f782a1c4b2a0ce4558077c8f62cccddf8ac5f3;hpb=ef5839d87a19abf3f7b7ab8e0488e78e48a45ae5;p=bin.git

diff --git a/web-update-server b/web-update-server
index 23f782a..2c36d71 100755
--- a/web-update-server
+++ b/web-update-server
@@ -5,8 +5,7 @@ set -e
 
 gitrun() {
   git -C $dir reset --hard
-  git -C $dir clean -fxd
-  git -C $dir pull origin main --ff-only 
+  git -C $dir pull origin main --rebase
 }
 
 if [[ $1 == "gemini" ]]; then
@@ -22,5 +21,5 @@ elif [[ $1 == "fortune" ]]; then
 elif [[ $1 == "http" ]]; then
   dir=/var/www/armaanb.net-http
   gitrun
-  (cd /var/www/armaanb.net-http ; make)
+  (cd /var/www/armaanb.net-http ; make -B)
 fi