Git Advanced Workflows

Master interactive rebasing, cherry-picking, bisect debugging, and worktrees without the fear of breaking your repository. Covers the practical workflows you actually need: cleaning commit history before PRs, applying hotfixes across multiple branches, binary searching for bug introductions, and working on multiple features simultaneously. The reflog recovery techniques alone will save you from panic when things go sideways. This is the Git knowledge that separates junior developers from seniors, with real commands and safety nets for every operation.

skills.sh installs: 19.9K
GitHub stars: 42.4K
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add wshobson/agents --skill git-advanced-workflows --agent claude-code

Installs into .claude/skills of the current project.

Files

Git Advanced Workflows

Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.

When to Use This Skill

Cleaning up commit history before merging
Applying specific commits across branches
Finding commits that introduced bugs
Working on multiple features simultaneously
Recovering from Git mistakes or lost commits
Managing complex branch workflows
Preparing clean PRs for review
Synchronizing diverged branches

Core Concepts

1. Interactive Rebase

Interactive rebase is the Swiss Army knife of Git history editing.

Common Operations:

pick: Keep commit as-is
reword: Change commit message
edit: Amend commit content
squash: Combine with previous commit
fixup: Like squash but discard message
drop: Remove commit entirely

Basic Usage:

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

# Rebase all commits on current branch
git rebase -i $(git merge-base HEAD main)

# Rebase onto specific commit
git rebase -i abc123