git-advanced

git-advanced is a skill for Claude Code from Sagargupta16/claude-skills. It costs 50 tokens per session (1,587 once invoked), scanned A, original, MIT.

A guide to advanced Git work, where Git is the tool used to track code changes and collaborate with others.

In plain words
What is it for?
Use it for rebasing, squashing commits, cherry-picking, bisecting bugs, managing stashes, resolving merge conflicts, and maintaining monorepos.
Why use it?
It provides structured ways to rewrite commit history, move selected changes, find when a bug started, handle conflicts, and work with several related projects in a monorepo—a repository containing multiple projects.

Skill for Claude Code

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

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

Good fit Use it for rebasing, squashing commits, cherry-picking, bisecting bugs, managing stashes, resolving merge conflicts, and maintaining monorepos.

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

README.md
[![agentmods](https://agentmods.dev/badge/skills/sagargupta16/claude-skills/git-advanced/github.svg)](https://agentmods.dev/skills/sagargupta16/claude-skills/git-advanced)
Your own site
<a href="https://agentmods.dev/skills/sagargupta16/claude-skills/git-advanced"><img src="https://agentmods.dev/badge/skills/sagargupta16/claude-skills/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/sagargupta16/claude-skills/git-advanced"><img src="https://agentmods.dev/badge/skills/sagargupta16/claude-skills/git-advanced.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 50 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,587 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.00050 $0.01587
Opus 5 $0.00025 $0.00794
Sonnet 5 $0.00010 $0.00317
Haiku 4.5 $0.00005 $0.00159

Measured 9d ago against content hash 36966f7c32cb, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-09, from the pricing page.

Security

Grade A, and why

git-advanced 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 9d 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/skills/git-advanced/SKILL.md · 226 lines

How it starts

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

Advanced Git Patterns

Quick Reference

Task Command
Rebase onto main git rebase main
Interactive rebase (squash) git rebase -i HEAD~N
Cherry-pick a commit git cherry-pick <sha>
Find bug introduction git bisect start
Stash with name git stash push -m "description"
Undo last commit (keep changes) git reset --soft HEAD~1
See what changed in a file git log -p -- path/to/file
Find who changed a line git blame path/to/file

Rebase Workflows

Rebase feature branch onto main

git checkout feature-branch
git fetch origin
git rebase origin/main
# Fix conflicts if any, then:
git push --force-with-lease  # safer than --force

Use --force-with-lease instead of --force -- it refuses to push if someone else has pushed to the branch since your last fetch.

Interactive Rebase (clean up commits)

git rebase -i HEAD~5  # last 5 commits

In the editor:

pick abc1234 feat: add user model
squash def5678 fix typo in user model
squash ghi9012 more fixes
pick jkl3456 feat: add user routes
fixup mno7890 cleanup
Command Effect
pick Keep commit as-is
squash Merge into previous, combine messages
fixup Merge into previous, discard message
reword Keep commit, edit message
drop Remove commit entirely

When to Rebase vs Merge

Rebase Merge
Your feature branch behind main Integrating shared branches
Cleaning up local commits before PR Preserving branch history matters
Linear history preferred Multiple people on same branch
Your own branches only Never on shared/public branches

Conflict Resolution

Workflow

# During rebase or merge, conflicts show as:
<<<<<<< HEAD
current changes
=======
incoming changes
>>>>>>> branch-name

# After resolving each file:
git add resolved-file.py
git rebase --continue   # or git merge --continue

Read the full file on GitHub · 226 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. 9d ago First seen · 226 lines · 50 tokens per session scan A 36966f7c32cb

Subscribe to this mod's changes

git-advanced is a skill published in the GitHub repository Sagargupta16/claude-skills (5 stars, last pushed 3d ago), licensed MIT. It adds 50 tokens to every session and 1,587 once invoked, about $0.0003 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.

Related

Other skills, from other repositories

release

This skill should be used when the user wants to create a new release — bump version, tag, push, create GitHub release, and optionally publish to npm. Use when user says "release", "bump version", "publish", "cut a release", or "release candidate".

NikiforovAll/claude-code-marketplace · 60 tokens

crafting-commits

Generates git commit messages following conventional commit standards with collaborative attribution. Use when user requests commit message creation, drafting, or help with formatting.

shrwnsan/vibekit-claude-plugins · 34 tokens

branch-hygiene

Classify and clean up merged, stale, and orphaned git branches and worktrees. Detects squash-merges that git branch --merged cannot see, stale worktrees, and remote-gone branches. Use when user asks to clean up branches, prune worktrees, tidy the repo, or perform git housekeeping.

shrwnsan/vibekit-claude-plugins · 68 tokens

changelog-summarizing

Use this skill when the user asks to summarize, recap, or post about repository changes in the Shopware AI Coding Tools marketplace since a given date — phrases like "write a changelog post for Discord", "recap this week's commits for Slack", "summarize what shipped since 2026-04-01", "draft a release announcement".…

shopwareLabs/ai-coding-tools · 106 tokens

plugin-updating

Use this skill when the user asks to bump, update, or release a new version of a plugin in the Shopware AI Coding Tools marketplace — phrases like "bump test-writing to 3.8.0", "release a patch for dev-tooling", "update the plugin version". Handles synchronized version bumps across plugin.json and every SKILL.md…

shopwareLabs/ai-coding-tools · 102 tokens

commit-message-writing

Use this skill when the user explicitly asks to generate, write, draft, or create a commit message, squash commit, commit title, or merge commit message for the Shopware core repository (shopware/shopware). Supports two modes — full commit messages (title + body) for branch commits, and squash merge titles…

shopwareLabs/ai-coding-tools · 160 tokens