How does this skill help with messy commit histories?

It provides step-by-step guidance on using interactive rebasing to squash 'fixup' commits, reword messages, and reorder history for a professional, readable pull request.

How do I work on two branches at once without stashing?

The skill teaches you how to use Git Worktrees, which allow you to have multiple branches checked out in different directories simultaneously.

What if I accidentally performed a hard reset and lost work?

The skill includes recovery workflows using the Git Reflog, which tracks every movement of the HEAD, allowing you to find and restore 'lost' commits.

Is rewriting history safe for shared branches?

The skill emphasizes best practices like only rebasing local commits and using --force-with-lease to ensure you don't overwrite a teammate's work.

Can I use this to find bugs automatically?

Yes, the skill includes patterns for using git bisect, including automated scripts that can binary search your history to find the exact commit where a test started failing.

Git Advanced Workflows

Name: Git Advanced Workflows
Author: pur3v4d3r

bypur3v4d3r

•

Developer Tools

Master advanced Git operations like interactive rebasing, bisecting, and worktrees to maintain clean repository history and recover from mistakes.

About

This skill empowers Claude to handle complex Git scenarios, from cleaning up feature branches and squashing commits to performing binary searches for bugs using git bisect. It provides comprehensive guidance on maintaining a linear history through interactive rebasing, managing multiple tasks simultaneously with worktrees, and using the reflog as a safety net to recover seemingly lost data. This is an essential utility for developers working on collaborative projects who need to ensure high-quality, readable commit histories and efficient version control troubleshooting.

Key Features

Interactive rebasing for commit squashing and history cleanup
Automated bug identification using Git Bisect binary search
Advanced cherry-picking and partial commit application
Data recovery techniques using the Git Reflog safety net
Simultaneous multi-branch development with Git Worktrees
1 GitHub stars

Use Cases

Identifying the exact commit that introduced a regression in a large codebase
Recovering work after accidental hard resets or deleted local branches
Cleaning up and organizing messy commit histories before opening pull requests

About

Key Features

Interactive rebasing for commit squashing and history cleanup
Automated bug identification using Git Bisect binary search
Advanced cherry-picking and partial commit application
Data recovery techniques using the Git Reflog safety net
Simultaneous multi-branch development with Git Worktrees
1 GitHub stars

Use Cases

Identifying the exact commit that introduced a regression in a large codebase
Recovering work after accidental hard resets or deleted local branches
Cleaning up and organizing messy commit histories before opening pull requests