tomasr/Nix-Git-Cherry-Picker
1
0
Fork 0
mirror of https://github.com/tomasriveral/Nix-Git-Cherry-Picker.git synced 2026-08-12 02:38:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

replace: --force-with-lease by --force

Browse Source
This commit is contained in:
tomasr
2026-06-08 13:33:59 +02:00
parent 6a0c9f4d01
commit 2830e32498
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ngcp.sh
+2 -2
View File
@@ -82,7 +82,7 @@ if [[ "$1" == "pick" ]]; then
fi fi
fi fi
done done
git -C "$nixConfigPath" push --force-with-lease origin "$remoteBranch" git -C "$nixConfigPath" push --force origin "$remoteBranch"
git -C "$nixConfigPath" checkout "$localBranch" git -C "$nixConfigPath" checkout "$localBranch"
elif [[ "$1" == "pull" ]]; then elif [[ "$1" == "pull" ]]; then
gitStatus=$(git -C "$nixConfigPath" status --porcelain) gitStatus=$(git -C "$nixConfigPath" status --porcelain)
@@ -113,7 +113,7 @@ elif [[ "$1" == "pull" ]]; then
echo "Pull successful" echo "Pull successful"
fi fi
fi fi
git -C "$nixConfigPath" push --force-with-lease origin "$localBranch" git -C "$nixConfigPath" push --force origin "$localBranch"
else else
echo "Invalid argument. Please run ngcp --help" echo "Invalid argument. Please run ngcp --help"
exit exit