From 9198ba98cc799f16e22ea9374f51d9d2e8fbbb9e Mon Sep 17 00:00:00 2001 From: TudbuT Date: Wed, 12 Jun 2024 11:53:24 +0200 Subject: [PATCH] allow release -f --- scripts/release.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 7b69fbf..d8bf382 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -4,8 +4,8 @@ if ! git diff-index --quiet --cached HEAD -- ; then echo "Cannot release dirty git tree. Commit your changes to main first." exit 1 fi -git push +git push "$@" git checkout release -git merge main -git push +git reset --hard main +git push "$@" git checkout main \ No newline at end of file