skills sourced live from GitHub · all skills listed are free · each skill is provided under its author's license.
home / Coding / Git Advanced Workflows Skill by @wshobson
The skill is the plugins/developer-essentials/skills/git-advanced-workflows folder inside that repository. Copy it into the folder your agent loads skills from; check your agent's documentation for where that is.
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation.
A reference for the Git techniques that rescue messy histories: interactive rebase, cherry-picking, bisect, worktrees and reflog. It is useful both for cleaning up and for recovering from mistakes.
The original SKILL.md is organised into these sections:
Written and maintained by @wshobson. It is published under the MIT license, which allows reuse with attribution. See the author profile. SkillDirectory does not claim authorship: this page adds our own review and links back to the original, and the skill's text belongs to its author.
# Git Advanced Workflows Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence. ## When to Use This Skill - 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 -i HEAD~5 # Rebase all commits on current branch …
Excerpt only, quoted from the author's repository. Open the repository for the complete file.