git-advanced-workflows

npx skills add sickn33/agentic-awesome-skills --skill git-advanced-workflows --agent claude-code

Same command for any agent — swap --agent for codex, cursor, copilot.

# Git Advanced Workflows Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence. ## Do not use this skill when - The task is unrelated to git advanced workflows - You need a different domain or tool outside this scope ## Instructions - Clarify goals, constraints, and required inputs. - Apply relevant best practices and validate outcomes. - Provide actionable steps and verification. ## When to Use - 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:** ```bash # Rebase last 5 commits git rebase

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
Cherry-pick single commit
git cherry-pick abc123
Cherry-pick range of commits (exclusive start)
git cherry-pick abc123..def456