Set git pull.rebase false in setup.sh to prevent divergent branch errors
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
4
setup.sh
4
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."
|
||||
|
||||
Reference in New Issue
Block a user