From c8c15161febe0607763eb0a7631749dd923acbcf Mon Sep 17 00:00:00 2001 From: Tine Date: Mon, 6 Jan 2025 20:40:42 +0100 Subject: [PATCH] fix(ingress.tjo.cloud/dyndns): use fetch and reset --- ingress.tjo.cloud/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ingress.tjo.cloud/install.sh b/ingress.tjo.cloud/install.sh index bb56ee9..6a34a0e 100755 --- a/ingress.tjo.cloud/install.sh +++ b/ingress.tjo.cloud/install.sh @@ -15,7 +15,8 @@ if [ ! -d .git ]; then git sparse-checkout set --no-cone /ingress.tjo.cloud git checkout else - git pull --depth=1 --rebase + git fetch --depth=1 + git reset --hard origin/main fi # Enter ingress directory cd /srv/ingress.tjo.cloud