Skip to content

Skill

Git Advanced Workflows

wshobson

Reshapes an existing Git history and untangles branches - interactive rebase, cherry-picking, bisecting to the commit that broke something, worktrees, and rescuing lost work through the reflog. It is about MANIPULATING the repository's history and recovering from mistakes, not about how you word a commit, open a pull request, or cut a release.

Situations it fits

Your feature and main branches got tangled: a few commits need to be moved to a new branch, one important change seems to have vanished from the log, and a recent commit introduced a failing test you must locate.
Git Advanced Workflows. git-advanced-workflows specializes in manipulating history and branches: extracting specific commits onto other branches, recovering work that is no longer reachable, and locating the commit that caused a regression. The other skills don't perform surgical history edits or recovery - release-skills handles shipping releases, conventional-commit crafts message text, and create-pull-request publishes a branch for review.
You accidentally pushed a large binary in the middle of a feature's sequence and later realised one of your commits was effectively empty; you want to surgically remove the bad object and restore a commit you thought overwritten.
Git Advanced Workflows. git-advanced-workflows specializes in manipulating the repository’s recorded changes and recovering lost or damaged commits - removing problematic entries, restoring lost work, and reshaping the recorded sequence. The other skills focus on message wording, opening review requests, or publishing releases, none of which perform low-level repo surgery or recovery.
A teammate pushed a messy series of edits and you need to reorder, combine, and drop some of those recorded changes before the branch goes public so the log reads sensibly.
Git Advanced Workflows. When the task is to rearrange, squash, or remove entries in the repo's recorded sequence, the advanced Git workflows skill is the right tool - it reshapes the recorded changes and cleans up the timeline. The other skills deal with composing messages, opening review requests, or making releases, none of which perform that kind of timeline surgery.

6 scenarios in the bank answer to Git Advanced Workflows. The rest are in the game.

Skills it gets confused with

These share a family with Git Advanced Workflows, which is another way of saying they are the ones you might reach for by mistake.

Knowing what Git Advanced Workflows does is the easy half. Telling it apart from the others under time pressure is the game.

Today's session

Git Advanced Workflows is part of wshobson/agents. Licence: MIT. The description above was written for this game, not taken from the skill.