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