What is the benefit of using Git Worktrees?

Git Worktrees allow you to have multiple branches of the same repository checked out in different directories simultaneously. This lets you work on an urgent bugfix in one folder without stashing or interrupting your current feature work in another.

How can I recover a branch I accidentally deleted?

You can use 'git reflog' to find the commit hash where the branch head was before deletion. Once identified, run 'git branch ' to restore it.

What does --force-with-lease do?

It is a safer version of git push --force. it checks if your local representation of the remote branch matches the actual remote branch before overwriting, preventing you from accidentally destroying a teammate's work.

When should I use rebase instead of merge?

Use rebase to clean up local commits before pushing or to keep a feature branch up-to-date with main for a linear history. Use merge to integrate completed features into public branches to preserve the collaborative history.

Git Advanced Workflows

Name: Git Advanced Workflows
Author: HermeticOrmus

byHermeticOrmus

開発者ツール

Master professional Git techniques including interactive rebasing, bisecting, and reflog to maintain a clean repository history and recover from errors.

概要

This skill empowers Claude to guide developers through complex Git operations that go beyond basic version control. It provides structured implementation patterns for interactive rebasing to clean up commit history, binary search debugging with Git Bisect, and concurrent branch management using Worktrees. Designed for developers managing sophisticated projects, it offers reliable strategies for disaster recovery via the reflog and precise patch management through cherry-picking, ensuring a professional, linear, and maintainable codebase even in high-stakes environments.

主な機能

Interactive rebase orchestration for squashing, rewording, and reordering commits
Multi-branch management using Git Worktrees for concurrent feature development
Safe history rewriting patterns using force-with-lease and atomic commit strategies
Automated and manual Git Bisect workflows for rapid bug isolation
Disaster recovery procedures using Git Reflog to restore lost commits and branches
0 GitHub stars

ユースケース

Pinpointing the exact commit that introduced a regression in a large, complex codebase
Preparing a clean, logical commit history for code review before merging a pull request
Recovering essential work after an accidental hard reset or branch deletion

概要

主な機能

Interactive rebase orchestration for squashing, rewording, and reordering commits
Multi-branch management using Git Worktrees for concurrent feature development
Safe history rewriting patterns using force-with-lease and atomic commit strategies
Automated and manual Git Bisect workflows for rapid bug isolation
Disaster recovery procedures using Git Reflog to restore lost commits and branches
0 GitHub stars

ユースケース

Pinpointing the exact commit that introduced a regression in a large, complex codebase
Preparing a clean, logical commit history for code review before merging a pull request
Recovering essential work after an accidental hard reset or branch deletion