fix entry.sh to rebase upon pulls

This commit is contained in:
root 2025-05-08 13:05:36 +02:00
parent ed4d26da51
commit 122dc8f328

View file

@ -10,6 +10,7 @@ while true; do
echo "$(date): Cloning or updating the repository..." echo "$(date): Cloning or updating the repository..."
git config --global --add safe.directory /repo git config --global --add safe.directory /repo
git config --global --add http.proxy socks5h://localhost:9050 git config --global --add http.proxy socks5h://localhost:9050
git config --global pull.rebase true
if [ -d "/repo/.git" ]; then if [ -d "/repo/.git" ]; then
git stash git stash
#git submodule foreach 'git stash; git reset --hard' #git submodule foreach 'git stash; git reset --hard'