From c580a9b0f9758da0044995e917c92069e8918eac Mon Sep 17 00:00:00 2001 From: jpk Date: Thu, 29 Feb 2024 21:27:45 +0100 Subject: [PATCH] pull ff-only --- .gitea/workflows/cron.yml | 4 ++-- .gitea/workflows/push.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/cron.yml b/.gitea/workflows/cron.yml index 761e8a2..cdc7e2f 100644 --- a/.gitea/workflows/cron.yml +++ b/.gitea/workflows/cron.yml @@ -42,5 +42,5 @@ jobs: run: | git config --global user.name "Ghost in the Shell" git config --global user.email "gits@goat.foo" - git pull origin master - git push --ff-only origin HEAD:master + git pull --ff-only origin master + git push origin HEAD:master diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml index 2fd04a9..e598f8d 100644 --- a/.gitea/workflows/push.yaml +++ b/.gitea/workflows/push.yaml @@ -43,5 +43,5 @@ jobs: run: | git config --global user.name "Ghost in the Shell" git config --global user.email "gits@goat.foo" - git pull origin master - git push --ff-only origin HEAD:master + git pull --ff-only origin master + git push origin HEAD:master