From 2830e324980f129e762fb1a3806c8b2361b379aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:33:59 +0200 Subject: [PATCH] replace: --force-with-lease by --force --- ngcp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ngcp.sh b/ngcp.sh index 7fa6c5c..c18bb81 100755 --- a/ngcp.sh +++ b/ngcp.sh @@ -82,7 +82,7 @@ if [[ "$1" == "pick" ]]; then fi fi done - git -C "$nixConfigPath" push --force-with-lease origin "$remoteBranch" + git -C "$nixConfigPath" push --force origin "$remoteBranch" git -C "$nixConfigPath" checkout "$localBranch" elif [[ "$1" == "pull" ]]; then gitStatus=$(git -C "$nixConfigPath" status --porcelain) @@ -113,7 +113,7 @@ elif [[ "$1" == "pull" ]]; then echo "Pull successful" fi fi - git -C "$nixConfigPath" push --force-with-lease origin "$localBranch" + git -C "$nixConfigPath" push --force origin "$localBranch" else echo "Invalid argument. Please run ngcp --help" exit