diff --git a/setup.sh b/setup.sh index b2c8f6c..d3952db 100755 --- a/setup.sh +++ b/setup.sh @@ -9,6 +9,10 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" echo "=== Security Tools Setup ===" echo "" +# ── Git config ──────────────────────────────────────────────────────────────── +git -C "$SCRIPT_DIR" config pull.rebase false +echo "Git pull strategy set to merge." + # ── Telegram credentials ─────────────────────────────────────────────────────── if [[ -f "$SCRIPT_DIR/config.sh" ]]; then echo "config.sh already exists — skipping credential setup."