git-advanced-workflows (wshobson)
- Dev Workflow
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.
A situation 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.
6 scenarios in the bank answer to git-advanced-workflows (wshobson). The rest are in the game.
Skills it gets confused with
These share a family with git-advanced-workflows (wshobson), which is another way of saying they are the ones you might reach for by mistake.
- conventional-commit (marcelorodrigo)Shapes the message of the commit you are about to make into the Conventional Commits format — a `type(scope): subject` header with an optional body, footer, and breaking-change marker that downstream tooling can parse. Its job is WORDING one commit; it does not rewrite past history, juggle branches, or assemble the release those commits eventually roll into.
- create-pull-request (cline)Turns a finished feature branch into a review-ready GitHub pull request — confirming the branch and base, summarising the commits into a description, filling the repo's PR template, and opening it with the `gh` CLI. It is about PUBLISHING your own work for review, not judging someone else's PR, crafting the individual commits, or tagging the release that follows.
- release-skills (jimliu)Cuts a versioned release for whatever kind of project you have — detecting the version file (package.json, pyproject.toml, Cargo.toml, and more), bumping the semantic version, updating the changelog, tagging, and publishing a GitHub Release. It handles SHIPPING the release, not the branch surgery, commit wording, or pull-request creation that comes before it.
Knowing what git-advanced-workflows (wshobson) does is the easy half. Telling it apart from the others under time pressure is the game.
Today's sessiongit-advanced-workflows (wshobson) is part of wshobson/agents. Licence: MIT. The description above was written for this game, not taken from the skill.