git-assistant

git-assistant is an agent for Claude Code from ypollak2/claude-code-kickstart. It costs 22 tokens per session (327 once invoked), scanned A, original, MIT.

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 for Claude Code

Written for Claude Code: a Claude Code subagent (agents/*.md). Also seen: model in frontmatter.

Good fit 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.

Compare 6 agents from other repositories ↓
Install with agentmods
npx agentmods add agents/ypollak2/claude-code-kickstart/git-assistant
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.

Clone the repo
git clone --depth 1 https://github.com/ypollak2/claude-code-kickstart

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for git-assistant

README.md
[![agentmods](https://agentmods.dev/badge/agents/ypollak2/claude-code-kickstart/git-assistant/github.svg)](https://agentmods.dev/agents/ypollak2/claude-code-kickstart/git-assistant)
Your own site
<a href="https://agentmods.dev/agents/ypollak2/claude-code-kickstart/git-assistant"><img src="https://agentmods.dev/badge/agents/ypollak2/claude-code-kickstart/git-assistant/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for git-assistant

Your own site · 80×15
<a href="https://agentmods.dev/agents/ypollak2/claude-code-kickstart/git-assistant"><img src="https://agentmods.dev/badge/agents/ypollak2/claude-code-kickstart/git-assistant.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
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. A grade says what 26 rules found in the file — not that it is safe.
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.1 $0.00022 $0.00327
Opus 5.5 $0.00009 $0.00131
Sonnet 5.5 $0.00004 $0.00065
Haiku 4.5 $0.00002 $0.00033

Measured 1mo ago against content hash bb4e850f6e6e, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, 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 1mo 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. 1mo 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 6mo ago), licensed MIT. It adds 22 tokens to every session and 327 once invoked, about $0.0001 per session on Opus 5.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.

Related

Other agents, from other repositories

git-committer

Use for local git operations only — read, status, diff, log, add, commit, branch, fetch, and worktree. Does NOT push. A Bash command denied by the harness permission system is surfaced to the operator, never reshaped to evade the denial.

axiomantic/spellbook · 59 tokens

git-pusher

Use for git push operations only. Operator confirmation is REQUIRED for every push. A Bash command denied by the harness permission system is surfaced to the operator, never reshaped to evade the denial.

axiomantic/spellbook · 44 tokens

pr-creator

Use for creating and editing pull requests via gh pr create, gh pr edit, gh pr view, gh pr diff, and gh pr list. Does NOT merge or mark ready (use pr-merger for that). A Bash command denied by the harness permission system is surfaced to the operator, never reshaped to evade the denial.

axiomantic/spellbook · 75 tokens

pr-merger

Use for gh pr merge and gh pr ready only. Operator confirmation is REQUIRED for every merge or ready-mark. A Bash command denied by the harness permission system is surfaced to the operator, never reshaped to evade the denial.

axiomantic/spellbook · 53 tokens

patch-generator

Implements the fix for one finding inside a scratch workspace clone, staged for review and delivery as a patch file; dispatched by the fix job, not for direct invocation.

fuxicodex/Fuxi · 37 tokens

fixer

Bug fixer agent. Picks up open GitHub issues labeled 'bug' or 'seeker', creates a fix branch, implements the fix, runs tests, and raises a PR. Use for automated bug fixing from issue queue.

randomittin/heimdall · 48 tokens