agentmods.dev

git-assistant

git-assistant is an agent for Claude Code from Sagargupta16/claude-skills. It costs 87 tokens per session (422 once invoked), scanned A, original, MIT.

An agent for difficult Git operations such as rebasing, cherry-picking, resolving conflicts, finding the commit that introduced a bug, and cleaning up history. Git is a system for tracking changes to code.

In plain words
What is it for?
Use it to resolve merge conflicts, rebase a branch, apply selected commits, investigate history with bisect or blame, manage stashes, and verify the resulting branch.
Why use it?
It helps handle changes that affect multiple commits or branches while checking the current state and testing the result.

Agent for Claude Code

Written for Claude Code: shipped in a Claude Code plugin. Also seen: model in frontmatter.

Part of the git-advanced plugin — 1 skill, 1 command, 1 agent shipped together

not rated 5repo yesterday A scan 87 tokens original MIT

Good fit Use it to resolve merge conflicts, rebase a branch, apply selected commits, investigate history with bisect or blame, manage stashes, and verify the resulting branch.

Compare 6 agents from other repositories ↓
Install with agentmods
npx agentmods add agents/sagargupta16/claude-skills/git-assistant
View source ↗ Sagargupta16/claude-skills sagargupta.online
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/Sagargupta16/claude-skills

Made for: Claude Code.

Or install git-advanced, the plugin that ships this one along with the rest of its 1 skill, 1 command, 1 agent.

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/sagargupta16/claude-skills/git-assistant/github.svg)](https://agentmods.dev/agents/sagargupta16/claude-skills/git-assistant)
Your own site
<a href="https://agentmods.dev/agents/sagargupta16/claude-skills/git-assistant"><img src="https://agentmods.dev/badge/agents/sagargupta16/claude-skills/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/sagargupta16/claude-skills/git-assistant"><img src="https://agentmods.dev/badge/agents/sagargupta16/claude-skills/git-assistant.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 87 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 422 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.00087 $0.00422
Opus 5.5 $0.00035 $0.00169
Sonnet 5.5 $0.00017 $0.00084
Haiku 4.5 $0.00009 $0.00042

Measured 2mo ago against content hash 29f7133735b7, 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 2mo 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.

plugins/git-advanced/agents/git-assistant.md · 42 lines

What it actually says

You are a git expert. Handle complex git operations safely and methodically.

Capabilities

Conflict Resolution

  1. Run git status to see conflicted files
  2. Read each conflicted file to understand both sides
  3. Determine the correct resolution based on intent of both changes
  4. Resolve conflicts preserving both sides' intent where possible
  5. Run tests after resolution to verify nothing broke

Rebase Operations

  1. Check how far behind: git log --oneline main..HEAD and git log --oneline HEAD..main
  2. Stash any uncommitted changes
  3. Rebase onto target: git rebase main
  4. Resolve any conflicts that arise (one commit at a time)
  5. Verify with git log --oneline and run tests

Cherry-Pick

  1. Identify the exact commit(s) to cherry-pick
  2. Apply with git cherry-pick {sha}
  3. Resolve conflicts if any
  4. Verify the change is correct in the new context

History Exploration

  1. git log --oneline --graph for overview
  2. git blame {file} to trace specific lines
  3. git bisect to find the commit that introduced a bug

Safety Rules

  • Never force push to main/master
  • Never use git reset --hard without confirming with the user
  • Always verify the current branch before destructive operations
  • Stash uncommitted work before rebasing
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. 2mo ago First seen · 42 lines · 87 tokens per session scan A 29f7133735b7

Subscribe to this mod's changes

git-assistant is an agent published in the GitHub repository Sagargupta16/claude-skills (5 stars, last pushed yesterday), licensed MIT. It adds 87 tokens to every session and 422 once invoked, about $0.0003 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.

Claude CodeGit and workflowai-agentsclaudedeveloper-toolsmarketplaceplugins
Related

git-assistant compared with agents from other repositories

git-assistant next to 6 agents from other repositories
ModTypeStarsLast pushLicenceScanTokensWorks with
git-assistantSagargupta16/claude-skillsAgent5yesterdayMITA87Claude Code
implementermelodic-software/claude-code-pluginsAgent30todayMITA80Claude Code
scoped-implementermelodic-software/claude-code-pluginsAgent30todayMITA126Claude Code
plugin-submitterjimmc414/claude-code-plugin-marketplaceAgent4yesterdayMITA37Claude Code
parallel-integratejimmc414/claude-code-plugin-marketplaceAgent4yesterdayMITA0Claude Code
parallel-setupjimmc414/claude-code-plugin-marketplaceAgent4yesterdayMITA0Claude Code
parallel-monitorjimmc414/claude-code-plugin-marketplaceAgent4yesterdayMITA0Claude Code