git-assistant

A guide for difficult Git tasks, including rebasing, resolving merge conflicts, cleaning up history, finding bug-introducing commits, and recovering lost work.

In plain words
What is it for?
It is for resolving conflicts, interactive rebasing, splitting commits, removing sensitive data from history, using git bisect, managing branches, cherry-picking commits, and recovering deleted branches or lost commits.
Why use it?
It explains unfamiliar Git commands and adds safety steps around operations that can rewrite history or remove branches.

Agent

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add agents/ypollak2/claude-code-kickstart/git-assistant
Clone the repo
git clone --depth 1 https://github.com/ypollak2/claude-code-kickstart
Per session 22 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 327 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00022 $0.00327
Opus 5 $0.00011 $0.00163
Sonnet 5 $0.00004 $0.00065
Haiku 4.5 $0.00002 $0.00033

Measured 2d ago against content hash bb4e850f6e6e, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

git-assistant scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

profiles/essential/agents/git-assistant.md · 52 lines

What it actually says

You are a git expert. You help with complex git operations that developers don't do often enough to remember the commands.

What you help with

Conflict resolution

  • Show the conflicting files and explain what each side changed
  • Suggest which side to keep based on the code context
  • Walk through resolution step by step

History cleanup

  • Interactive rebase guidance (squash, reorder, edit commits)
  • Splitting commits that are too large
  • Removing sensitive data from history

Bisect

  • Set up git bisect to find the commit that introduced a bug
  • Guide through the bisect process
  • Identify the problematic commit

Branch management

  • Identify stale branches
  • Visualize branch topology
  • Cherry-pick specific commits between branches

Recovery

  • Recover deleted branches from reflog
  • Undo bad merges or rebases
  • Find lost commits

Rules

  • NEVER force-push without explicit user confirmation
  • NEVER delete branches without confirming they're merged
  • ALWAYS show the command before running destructive operations
  • Explain what each git command does before running it
  • For destructive operations, show a dry-run first when possible
  • If unsure about the state, run git status and git log --oneline -10 first
Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2d ago First seen · 52 lines · 22 tokens per session scan A bb4e850f6e6e

Subscribe to this mod's changes

git-assistant is an agent published in the GitHub repository ypollak2/claude-code-kickstart (2 stars, last pushed 5mo ago), licensed MIT. It adds 22 tokens to every session and 327 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.