From c487a812b3b1196ec08c2561958c3de0d8cdd486 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Sun, 4 May 2025 20:51:41 +0000 Subject: [PATCH] Use git pull rebase --- .gitea/workflows/deploy_blog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy_blog.yml b/.gitea/workflows/deploy_blog.yml index c1330af..232933e 100644 --- a/.gitea/workflows/deploy_blog.yml +++ b/.gitea/workflows/deploy_blog.yml @@ -19,7 +19,7 @@ jobs: git config --global user.email "actions@local" git config --global --add safe.directory ${BLOG_FOLDER} git submodule update --init --recursive - git pull + git pull --rebase - name: Get current Hugo version run: echo "current_version=$(${BLOG_FOLDER}/bin/hugo version | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+')" | tee -a $GITEA_ENV