Featured

git-advanced-workflows

Name: git-advanced-workflows
Rating: 5 (20990 reviews)
Author: wshobson

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.

TL;DR

Master advanced Git workflows to clean history, recover from errors, and manage complex branches efficiently.

What Is It

Edit commit history with interactive rebase
Apply specific commits across branches with cherry-pick
Find bug-introducing commits with git bisect
Work on multiple branches simultaneously with worktrees
Recover lost commits using reflog

Key Features

Interactive rebase: edit, squash, reword, drop commits
Cherry-pick: apply specific commits to other branches
Git bisect: binary search for bug-introducing commits
Worktrees: parallel development in separate directories
Reflog: track and recover deleted commits/branches
Auto-squash: combine fixup commits during rebase
Safe recovery from accidental resets via reflog
Maintain clean, linear history for PRs

How to Use

1.Use interactive rebase to clean feature branch history before PR
2.Cherry-pick critical fixes to release branches
3.Run git bisect to find bug-introducing commit
4.Add worktrees for parallel development
5.Use reflog to recover lost commits or branches
6.Rebase to keep history clean; merge to preserve collaboration history

Guardrails & Gotchas

MUST force push only if no one else is using the branch
FORBIDDEN: never rebase shared branches with others
CRITICAL: always use reflog to recover lost commits
MUST avoid merging in production branches without testing
FORBIDDEN: never use --force with shared branches
MUST test changes after cherry-pick or bisect

GitHub Stats

Author

@wshobson

Repository

wshobson/agents

Stars

20990

Explore More Skills

move-code-quality

@davila7

Analyzes Move language packages against the official Move Book Code Quality Checklist. Use this skill when reviewing Move code, checking Move 2024 Edition compliance, or analyzing Move packages for best practices. Activates automatically when working with .move files or Move.toml manifests.

12.4k

1.1k

1w ago

git-advanced-workflows

Explore More Skills

move-code-quality

e2e-testing-patterns

testing-anti-patterns