From f257fcfcb9d451dc9255bee1dd2777509f5fde8b Mon Sep 17 00:00:00 2001
From: pdmarf <135653545+pdmarf@users.noreply.github.com>
Date: Sat, 18 Apr 2026 16:59:15 +0100
Subject: [PATCH] Set git pull.rebase false in setup.sh to prevent divergent
 branch errors

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

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."