git-rescue

Estrellas0

Forks0

Actualizado24 de julio de 2026 a las 11:16

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.

Instalación

Instalar con Codex o Claude Copia este prompt, pégalo en Codex, Claude u otro asistente, y deja que revise la página de la skill y la instale por ti.

Fuente

moritalous

moritalous/agentic-engineering-patterns

Abrir repositorio de GitHub Ver repositorios del creador

Descarga

Ocupaciones relacionadasSOC

Basado en la clasificación ocupacional SOC

Desarrolladores de softwareOcupaciones informáticas y matemáticas·SOC 15-1252

SKILL.md

readonly

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 rescue and history surgery

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.

Recipes

Undo last commit (keep the changes): git reset --soft HEAD~1.
Remove one file from the last commit: reset it out, git rm --cached if needed, re-commit with --amend.
Combine the last N commits with a better message: soft-reset past them and re-commit, or interactive-rebase equivalent via git rebase.
Conflicted merge / rebase / cherry-pick: read both sides, reason through the intent of each change, combine them, then run the test suite before concluding the merge. Never resolve a conflict without running the tests.
Recover lost code: search git reflog, stashes, and other branches for the missing work; cherry-pick or check out what you find.
"When did this break?": use 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.
Extract a library with history: build a new repo from files of this one, replaying a commit history that preserves the original authors and dates.

Safety

Before anything destructive, check git status and stash or commit uncommitted work (git stash -u).
Only rewrite history that hasn't been shared, or that you've confirmed is safe to force-push (--force-with-lease, never bare --force).

Más de este repositorio

mismo repositorio

compound

moritalous/agentic-engineering-patterns

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.

2026-07-240

hoard

moritalous/agentic-engineering-patterns

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.

2026-07-240

interactive-explanation

moritalous/agentic-engineering-patterns

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.

2026-07-240

manual-test

moritalous/agentic-engineering-patterns

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.

2026-07-240

pr-ready

moritalous/agentic-engineering-patterns

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.

2026-07-240

proofread

moritalous/agentic-engineering-patterns

Proofread a document before publication — spelling, grammar, repetition, logical and factual errors, weak arguments, placeholder links. Reports issues; never rewrites the author's voice.

2026-07-240

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 rescue and history surgery

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.

Recipes

Undo last commit (keep the changes): git reset --soft HEAD~1.
Remove one file from the last commit: reset it out, git rm --cached if needed, re-commit with --amend.
Combine the last N commits with a better message: soft-reset past them and re-commit, or interactive-rebase equivalent via git rebase.
Conflicted merge / rebase / cherry-pick: read both sides, reason through the intent of each change, combine them, then run the test suite before concluding the merge. Never resolve a conflict without running the tests.
Recover lost code: search git reflog, stashes, and other branches for the missing work; cherry-pick or check out what you find.
"When did this break?": use 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.
Extract a library with history: build a new repo from files of this one, replaying a commit history that preserves the original authors and dates.

Safety

Before anything destructive, check git status and stash or commit uncommitted work (git stash -u).
Only rewrite history that hasn't been shared, or that you've confirmed is safe to force-push (--force-with-lease, never bare --force).