A Git recovery guide for mistakes such as discarded changes, bad resets, unwanted amendments, deleted branches, and failed rebases. Git is a version-control system that records code history.

Use it after a Git mistake. It checks repository history and the reflog, which is Git's record of where branch references recently pointed, before suggesting a recovery.

It chooses a recovery method based on whether work was committed or shared, reducing the risk of losing changes or rewriting history others use.

git-undo — Skill for Claude Code by KhaledSaeed18/dotclaude

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent

npx skills add KhaledSaeed18/dotclaude --skill git-undo

Clone the repo

git clone --depth 1 https://github.com/KhaledSaeed18/dotclaude

Made for: Claude Code.

Or install git, the plugin that ships this one along with the rest of its 9 skills, 3 commands.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/skills/khaledsaeed18/dotclaude/git-undo/github.svg)](https://agentmods.dev/skills/khaledsaeed18/dotclaude/git-undo)

Your own site

<a href="https://agentmods.dev/skills/khaledsaeed18/dotclaude/git-undo"><img src="https://agentmods.dev/badge/skills/khaledsaeed18/dotclaude/git-undo/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

Your own site · 80×15

<a href="https://agentmods.dev/skills/khaledsaeed18/dotclaude/git-undo"><img src="https://agentmods.dev/badge/skills/khaledsaeed18/dotclaude/git-undo.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 64 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 1,245 The whole file, excluding the scripts and references it only reads on demand.

Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.

Origin original No closer match found in the catalogue.

Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

Model	Per session	Once invoked
Fable 5.1	$0.00064	$0.01245
Opus 5.5	$0.00026	$0.00498
Sonnet 5.5	$0.00013	$0.00249
Haiku 4.5	$0.00006	$0.00125

Measured 1mo ago against content hash d36357b5ac55, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

git-undo scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 1mo ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.claude-plugin/plugins/git/skills/git-undo/SKILL.md · 75 lines

How it starts

The opening of the file, as written. The whole thing — 75 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Undo the mistake with the least-destructive tool that fits, after establishing two facts that change everything: has the work been committed, and has it been pushed/shared. Get those wrong and you either lose work or rewrite history other people depend on.

Hard rules: never break these

Diagnose before acting. Establish: committed or not? pushed or not? on a shared branch? Run git status, git log --oneline -10, and git reflog -20 first. The fix depends entirely on the answers.
Never rewrite published history casually. For anything already pushed to a shared branch, undo forward with git revert; do not reset/rebase/commit --amend and force-push unless the user explicitly owns the consequences and coordinates with collaborators.
Take a safety net before any destructive op. Before reset --hard, a force-push, or a history rewrite, snapshot the current tip: git branch backup/<desc> or git tag backup/<desc>. Reflog usually saves you, but a branch is free insurance.
--hard and clean destroy uncommitted work irrecoverably. Reflog only recovers committed states. Spell out exactly what will be lost and confirm before running them.
Confirm before any destructive or shared-history command: reset --hard, clean -fd, push --force*, history rewrites. Prefer push --force-with-lease over --force when a rewrite is genuinely required.

Step 1: Diagnose

git status: staged vs unstaged vs untracked; any operation in progress.
git log --oneline --graph -15: recent commits and branch shape.
git reflog -25: the time machine, every position HEAD has held, even "lost" ones. This is how you recover almost anything committed.
Determine shared or local: has the affected commit/branch been pushed? git status (ahead/behind), git branch -r --contains <sha>.

Step 2: Pick the fix

Match the situation to the safest tool:

Uncommitted work

Discard changes in a file → git restore <file> (was git checkout -- <file>).
Unstage but keep changes → git restore --staged <file> (was git reset HEAD <file>).
Set aside without losing → git stash push -m "<note>"; bring back with git stash pop.
Remove untracked files → git clean -nd (dry run first!), then git clean -fd once confirmed.

Read the full file on GitHub · 75 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

1mo ago First seen · 75 lines · 64 tokens per session scan A d36357b5ac55

Subscribe to this mod's changes

git-undo is a skill published in the GitHub repository KhaledSaeed18/dotclaude (5 stars, last pushed yesterday), licensed MIT. It adds 64 tokens to every session and 1,245 once invoked, about $0.0003 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Claude Code Commits Git and workflow agentic-tools ai-agents anthropic claude claude-skills

github-workflow

GitHub best practices for pull requests, code reviews, issues, Actions workflows, and repository management.

Mindrally/skills · 23 tokens

git-workflow

Git conventions and workflow guidelines using Conventional Commits, branching strategies, and best practices for version control.

Mindrally/skills · 23 tokens

lerna

Best practices for Lerna monorepo management, versioning, and publishing.

Mindrally/skills · 18 tokens

git-pushing

Stage, commit, and push git changes with conventional commit messages. Use when user wants to commit and push changes, mentions pushing to remote, or asks to save and push their work. Also activates when user says "push changes", "commit and push", "push this", "push to github", or similar git workflow requests.

mhattingpete/claude-skills-marketplace · 70 tokens

github-activity

Report what happened across GitHub repositories over a time window, read only. Invoke when the user asks what merged, which issues were opened or closed, or what moved between milestones since a date or since the last report, across one or more repositories.

curie-eng/curie · 54 tokens

implement-issue

Turn one labelled GitHub issue into one reviewed pull request, or stop with a stated reason. Use for every factory run; the message is a link to the issue.

curie-eng/curie · 38 tokens