From 7e882e81a24a668f71b560c37fffa6753992a431 Mon Sep 17 00:00:00 2001
From: Shay Palachy <shaypal5@users.noreply.github.com>
Date: Sat, 9 May 2026 10:31:06 +0300
Subject: [PATCH] Prefer git and gh CLI for repo operations

---
 AGENTS.md | 7 +++++--
 CLAUDE.md | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 4d41cd59..a1a97e8d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -497,7 +497,9 @@ ______________________________________________________________________
 
 ### c. **More Specific Tips**
 
-- **Use MCP for git operations** (commits, pushes, PRs) instead of CLI.
+- **Use standard git and gh CLI first** for commits, pushes, PRs, and other
+  git/GitHub operations. Use git/GitHub MCP tools only when the CLI has a gap,
+  the CLI is unavailable, or the user explicitly requests MCP usage.
 - **When in doubt, prefer explicit, readable code over cleverness.**
 - **Never use non-ASCII characters or the em dash.**
 - **If stuck, suggest opening a new chat with latest context.**
@@ -543,7 +545,8 @@ ______________________________________________________________________
 - **Workflow:** Issue → Feature branch → GitHub PR
 - **Branch naming:** `feature/<desc>`, `bugfix/<desc>`, etc.
 - **PRs:** Reference relevant issue, link to tests/docs as needed.
-- **Commits:** Use MCP tools, not direct git CLI.
+- **Commits:** Use standard `git` CLI first. Use git MCP tools only when the CLI
+  has a gap, the CLI is unavailable, or the user explicitly requests MCP usage.
 
 ______________________________________________________________________
 
diff --git a/CLAUDE.md b/CLAUDE.md
index b2439021..7e24b6bb 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -508,7 +508,9 @@ ______________________________________________________________________
 
 ### c. **Claude-Specific Tips**
 
-- **Use MCP for git operations** (commits, pushes, PRs) instead of CLI.
+- **Use standard git and gh CLI first** for commits, pushes, PRs, and other
+  git/GitHub operations. Use git/GitHub MCP tools only when the CLI has a gap,
+  the CLI is unavailable, or the user explicitly requests MCP usage.
 - **When in doubt, prefer explicit, readable code over cleverness.**
 - **Never use non-ASCII characters or the em dash.**
 - **If stuck, suggest opening a new chat with latest context.**
@@ -554,7 +556,8 @@ ______________________________________________________________________
 - **Workflow:** Issue → Feature branch → GitHub PR
 - **Branch naming:** `feature/<desc>`, `bugfix/<desc>`, etc.
 - **PRs:** Reference relevant issue, link to tests/docs as needed.
-- **Commits:** Use MCP tools, not direct git CLI.
+- **Commits:** Use standard `git` CLI first. Use git MCP tools only when the CLI
+  has a gap, the CLI is unavailable, or the user explicitly requests MCP usage.
 
 ______________________________________________________________________