Git Advanced

This is for when basic git commands aren't cutting it anymore and you need to rewrite history, split commits, or handle complex rebases. It covers interactive rebase workflows including squashing and fixup commits, cherry-picking across branches with mainline selection for merge commits, and commit surgery like changing authors or removing files from history. The source includes practical examples of filter-branch and BFG Repo-Cleaner for cleanup work. Honestly, these are the operations you hope you don't need often, but when you do, having the syntax and flag combinations ready saves a lot of frantic Stack Overflow searching. Just remember to coordinate with your team before force-pushing any history rewrites.

skills.sh installs: 324
GitHub stars: 8
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add geoffjay/claude-plugins --skill git-advanced --agent claude-code

Installs into .claude/skills of the current project.

Files

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