What is the benefit of using Git worktrees over stashing?

Worktrees allow you to have multiple branches checked out in separate directories simultaneously, meaning you can work on a hotfix and a feature at the same time without needing to constantly stash and apply changes.

Is it safe to rewrite history with this skill?

The skill emphasizes safety first, teaching you to use backup branches before risky operations and recommending '--force-with-lease' to avoid overwriting your teammates' work.

Does it support automated bug testing?

Absolutely. It includes instructions for using 'git bisect run' with a test script to automatically identify the exact commit that introduced a regression.

Can this skill help me recover deleted branches?

Yes, it provides specific workflows utilizing the Git reflog to track and restore commit hashes and branches that have been accidentally deleted within the last 90 days.

Advanced Git Workflows

Name: Advanced Git Workflows
Author: HermeticOrmus

byHermeticOrmus

0•

Developer Tools

Streamlines complex version control tasks through interactive rebasing, branch synchronization, and emergency history recovery.

The Advanced Git Workflows skill equips Claude with the expertise to manage sophisticated repository operations that go beyond basic branching and merging. It provides structured guidance for maintaining a clean, linear commit history through interactive rebasing, finding regressions using binary search with git bisect, and managing multiple development environments simultaneously via worktrees. Whether you need to recover lost commits using the reflog or prepare a pristine pull request, this skill ensures your version control practices remain professional, efficient, and resilient against mistakes.

Key Features

01Automated bug hunting via binary search with Git Bisect

02Disaster recovery and lost commit restoration via Reflog

03Multi-branch development without stashing using Worktrees

04Interactive history rewriting and commit squashing

050 GitHub stars

06Safe history pushing using force-with-lease protocols

Use Cases

01Cleaning up and squashing messy local commits before submitting a pull request

02Managing urgent hotfixes while simultaneously working on long-running feature branches

03Identifying the specific commit that introduced a bug in a large codebase

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add hermeticormus/after-the-third-cup git-advanced-workflows

For use in Claude.ai and ChatGPT

Download Skill