Menu
Sort out git messes and perform history surgery — undo/rewrite commits, resolve conflicted merges and rebases, recover lost code via reflog, find regressions with git bisect.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Run the compound engineering step — a short retrospective after a piece of work that folds what was learned back into CLAUDE.md, the skills, or the hoard. Use at the end of every significant task.
Save a newly-figured-out trick as a minimal working example in hoard/, so future sessions can reuse or recombine it. Use after solving something non-obvious for the first time.
Build a self-contained interactive or animated HTML page that explains how an algorithm or piece of code works. Use to pay down cognitive debt when a written explanation isn't enough.
Manually exercise code beyond the automated tests — python -c for libraries, curl for APIs, browser automation with screenshots for web UIs — and document the results. Use after tests pass, before declaring work done.
Pre-pull-request checklist — verify the code works, the diff is reviewable, and the PR carries context and evidence of testing. Run before opening any pull request.
Proofread a document before publication — spelling, grammar, repetition, logical and factual errors, weak arguments, placeholder links. Reports issues; never rewrites the author's voice.
| name | git-rescue |
| description | Sort out git messes and perform history surgery — undo/rewrite commits, resolve conflicted merges and rebases, recover lost code via reflog, find regressions with git bisect. |
Git history is not a court record — it's a deliberately authored story of the project. Everything in git can be undone, so work boldly but carefully.
The argument to this skill describes the mess or the desired history change.
git reset --soft HEAD~1.git rm --cached if
needed, re-commit with --amend.git rebase.git reflog, stashes, and other branches for
the missing work; cherry-pick or check out what you find.git bisect — write the test condition as a
script (exit 0 = good, non-zero = bad), give bisect the known-good and
known-bad commits, and let the binary search find the culprit.git status and stash or commit
uncommitted work (git stash -u).--force-with-lease, never bare --force).