git-advanced

git-advanced is a skill for Claude Code from geoffjay/claude-plugins. It costs 39 tokens per session (3,985 once invoked), scanned C, original, MIT.

A guide to advanced Git operations such as interactive rebase, commit editing, cherry-picking, and complex merges. Rewriting history means changing existing commits, which can affect collaborators if those commits are shared.

In plain words
What is it for?
Use it for interactive rebases, history cleanup, advanced merges, cherry-picks, commit surgery, and difficult conflict resolution.
Why use it?
It helps experienced Git users clean up history, combine or split commits, and handle complicated branch changes.

Skill for Claude Code

Written for Claude Code: shipped in a Claude Code plugin.

Part of the git plugin — 4 skills shipped together

Good fit Use it for interactive rebases, history cleanup, advanced merges, cherry-picks, commit surgery, and difficult conflict resolution.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/geoffjay/claude-plugins/git-advanced
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.

Any agent
npx skills add geoffjay/claude-plugins --skill git-advanced
Clone the repo
git clone --depth 1 https://github.com/geoffjay/claude-plugins

Made for: Claude Code.

Or install git, the plugin that ships this one along with the rest of its 4 skills.

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-advanced

README.md
[![agentmods](https://agentmods.dev/badge/skills/geoffjay/claude-plugins/git-advanced/github.svg)](https://agentmods.dev/skills/geoffjay/claude-plugins/git-advanced)
Your own site
<a href="https://agentmods.dev/skills/geoffjay/claude-plugins/git-advanced"><img src="https://agentmods.dev/badge/skills/geoffjay/claude-plugins/git-advanced/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-advanced

Your own site · 80×15
<a href="https://agentmods.dev/skills/geoffjay/claude-plugins/git-advanced"><img src="https://agentmods.dev/badge/skills/geoffjay/claude-plugins/git-advanced.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 39 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 3,985 The whole file, excluding the scripts and references it only reads on demand.
Security scan C 1 finding. 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.00039 $0.03985
Opus 5.5 $0.00016 $0.01594
Sonnet 5.5 $0.00008 $0.00797
Haiku 4.5 $0.00004 $0.00398

Measured 1mo ago against content hash fec72fe525a7, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade C, and why

git-advanced scanned grade C with 1 finding 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.

Recursive force deletehighDestructive command

rm -rf with a variable or a broad path is one typo away from removing the wrong tree.

git rm -rf .
plugins/utilities/git/skills/git-advanced/SKILL.md · 716 lines

How it starts

The opening of the file, as written. The whole thing — 716 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Git Advanced Operations Skill

This skill provides comprehensive guidance on advanced git operations, sophisticated rebase strategies, commit surgery techniques, and complex history manipulation for experienced git users.

When to Use

Activate this skill when:

  • Performing complex interactive rebases
  • Rewriting commit history
  • Splitting or combining commits
  • Advanced merge strategies
  • Cherry-picking across branches
  • Commit message editing in history
  • Author information changes
  • Complex conflict resolution

Interactive Rebase Strategies

Basic Interactive Rebase

# Rebase last 5 commits
git rebase -i HEAD~5

# Rebase from specific commit
git rebase -i abc123^

# Rebase entire branch
git rebase -i main

Rebase Commands

# Interactive rebase editor commands:
# p, pick = use commit
# r, reword = use commit, but edit commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like squash, but discard commit message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit

Squashing Commits

# Example: Squash last 3 commits
git rebase -i HEAD~3

# In editor:
pick abc123 feat: add user authentication
squash def456 fix: resolve login bug
squash ghi789 style: format code

# Squash all commits in feature branch
git rebase -i main
# Mark all except first as 'squash'

Fixup Workflow

# Create fixup commit automatically
git commit --fixup=abc123

# Autosquash during rebase
git rebase -i --autosquash main

# Set autosquash as default
git config --global rebase.autosquash true

# Example workflow:
git log --oneline -5
# abc123 feat: add authentication
# def456 feat: add authorization
git commit --fixup=abc123
git rebase -i --autosquash HEAD~3

Reordering Commits

# Interactive rebase
git rebase -i HEAD~5

# In editor, change order:
pick def456 feat: add database migration
pick abc123 feat: add user model
pick ghi789 feat: add API endpoints

# Reorder by moving lines:
pick abc123 feat: add user model
pick def456 feat: add database migration
pick ghi789 feat: add API endpoints

Read the full file on GitHub · 716 lines

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 · 716 lines · 39 tokens per session scan C fec72fe525a7

Subscribe to this mod's changes

git-advanced is a skill published in the GitHub repository geoffjay/claude-plugins (8 stars, last pushed 11mo ago), licensed MIT. It adds 39 tokens to every session and 3,985 once invoked, about $0.0002 per session on Opus 5.5. A static security scan graded it C with 1 finding (recursive force delete). No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-03.