Claude Skill

git-recovery

Recovers lost git work and undoes mistakes safely. Use whenever the user says they lost commits, ran git reset --hard, deleted a branch, dropped a stash, committed on the wrong branch, broke a merge or rebase, force pushed, wants to undo a commit or a push, or asks how to get a f

LLM Mart · 0 points · 0 views 0 listing impressions 0 install-command copies
Download mehranqadirian-skills-git_git-recovery-c88187d.zip · 5 KB

Install

skills CLI npx skills add https://github.com/MehranQadirian/skills/tree/main/git/git-recovery
Claude Code claude plugin marketplace add https://llmmart.ai/marketplace.json && claude plugin install mehranqadirian-skills@llmmart
Git git clone https://github.com/MehranQadirian/skills.git

The skills CLI installs just this skill, for any of its supported agents. Claude Code installs the whole mehranqadirian/skills collection as a plugin from our marketplace. Git is the plain clone.

README

git-recovery

A Claude skill that recovers lost commits and undoes git mistakes without making things worse.

What it does

  • Finds lost work through the reflog, unreachable commits and stashes
  • Restores a commit onto a new branch, never overwriting anything
  • Provides a situation to command cookbook for undo, amend, revert, reset, merge and rebase problems
  • Explains which fixes are safe on shared branches

Try it

I ran git reset --hard and lost two commits. Help me get them back.

I deleted a branch by mistake.

I committed to main instead of my feature branch.

Install

Claude.ai: zip this folder, then go to Settings > Capabilities > Skills > Upload.

Claude Code:

cp -r git/git-recovery ~/.claude/skills/

Structure

git-recovery/
├── SKILL.md                       skill instructions for Claude
├── scripts/find_lost.sh           find and restore lost commits
└── references/undo-cookbook.md    undo and recovery cookbook

Skill manifest

git-recovery

Git rarely loses committed work. The reflog and unreachable objects hold almost everything, so the job is to find the right commit and put a branch on it before anything cleans it up.

git-recovery/
├── SKILL.md
├── scripts/
│   └── find_lost.sh        list reflog, unreachable commits and stashes; restore onto a new branch
└── references/
    └── undo-cookbook.md    situation to command table, reset modes, safe habits

When to use

  • Commits disappeared after reset, rebase, checkout or a branch delete
  • A stash was dropped or never applied
  • Work was committed on the wrong branch
  • A merge, rebase or pull went wrong
  • Someone force pushed
  • Something must be undone, locally or after a push

Workflow

  1. Stop: do not run gc, prune, further reset --hard or more experiments. Check git status so uncommitted changes are not overwritten.
  2. Look: bash scripts/find_lost.sh (add --grep "message words" to narrow). It lists the reflog, unreachable commits and stashes with dates and subjects.
  3. Identify: match by time and message, then git show --stat <sha> to confirm it is the right work.
  4. Restore onto a new branch: bash scripts/find_lost.sh --restore <sha> rescued-work. It only creates a branch, so nothing is overwritten.
  5. Verify: git log --oneline rescued-work, check the files, run the tests.
  6. Then fix the original problem with the cookbook (references/undo-cookbook.md), using revert instead of reset on anything pushed.

Decision guide

Question Answer leads to
Was the work ever committed? Yes: reflog or unreachable commits. No: editor history, backups, or git fsck --lost-found for staged blobs
Is the bad commit pushed? Yes: git revert. No: reset, amend or rebase is acceptable
Is the branch shared? Yes: never rewrite history without agreement
Is a secret involved? Rotate it first (secrets-hygiene)

Rules

  • Create a backup branch before any risky command: git branch backup-before-fix
  • Prefer commands that add a new commit or branch over commands that delete
  • Say what each command changes before running it, and run destructive ones only after the user confirms
  • Use --force-with-lease, never plain --force
  • Recovery windows are finite: reflog entries expire, unreachable objects are garbage collected. Act soon.
  • If nothing is found, say so honestly and list what else to check, instead of guessing

What to report back

Field Content
What happened the command or event that lost the work
Found sha, date, subject of the recovered commit
Restored to branch name, verified how
Remaining risk uncommitted files, pushed history, expiring entries
Prevention backup branch habit, revert on shared branches

Related skills

  • systematic-debugging: reflog, bisect and blame for investigation
  • secrets-hygiene: when the mistake pushed a credential
  • termux-setup: git problems specific to a phone
Files (skills)
  • references
    • undo-cookbook.md 3.3 KB
      Loading…
  • scripts
    • find_lost.sh 2 KB
      Loading…
  • README.md 1023 B
    # git-recovery
    
    A [Claude skill](../../README.md) that recovers lost commits and undoes git mistakes without making things worse.
    
    ## What it does
    
    - Finds lost work through the reflog, unreachable commits and stashes
    - Restores a commit onto a new branch, never overwriting anything
    - Provides a situation to command cookbook for undo, amend, revert, reset, merge and rebase problems
    - Explains which fixes are safe on shared branches
    
    ## Try it
    
    > I ran git reset --hard and lost two commits. Help me get them back.
    
    > I deleted a branch by mistake.
    
    > I committed to main instead of my feature branch.
    
    ## Install
    
    **Claude.ai:** zip this folder, then go to Settings > Capabilities > Skills > Upload.
    
    **Claude Code:**
    
    ```bash
    cp -r git/git-recovery ~/.claude/skills/
    ```
    
    ## Structure
    
    ```
    git-recovery/
    ├── SKILL.md                       skill instructions for Claude
    ├── scripts/find_lost.sh           find and restore lost commits
    └── references/undo-cookbook.md    undo and recovery cookbook
    ```
    
  • SKILL.md 3.5 KB
    ---
    name: git-recovery
    description: Recovers lost git work and undoes mistakes safely. Use whenever the user says they lost commits, ran git reset --hard, deleted a branch, dropped a stash, committed on the wrong branch, broke a merge or rebase, force pushed, wants to undo a commit or a push, or asks how to get a file back from history, even if they only say "git ate my changes". Diagnoses with the reflog first, restores onto a new branch and never rewrites history without confirmation.
    ---
    
    # git-recovery
    
    Git rarely loses committed work. The reflog and unreachable objects hold almost everything, so the job is to find the right commit and put a branch on it before anything cleans it up.
    
    ```
    git-recovery/
    ├── SKILL.md
    ├── scripts/
    │   └── find_lost.sh        list reflog, unreachable commits and stashes; restore onto a new branch
    └── references/
        └── undo-cookbook.md    situation to command table, reset modes, safe habits
    ```
    
    ## When to use
    
    - Commits disappeared after `reset`, `rebase`, `checkout` or a branch delete
    - A stash was dropped or never applied
    - Work was committed on the wrong branch
    - A merge, rebase or pull went wrong
    - Someone force pushed
    - Something must be undone, locally or after a push
    
    ## Workflow
    
    1. **Stop**: do not run `gc`, `prune`, further `reset --hard` or more experiments. Check `git status` so uncommitted changes are not overwritten.
    2. **Look**: `bash scripts/find_lost.sh` (add `--grep "message words"` to narrow). It lists the reflog, unreachable commits and stashes with dates and subjects.
    3. **Identify**: match by time and message, then `git show --stat <sha>` to confirm it is the right work.
    4. **Restore onto a new branch**: `bash scripts/find_lost.sh --restore <sha> rescued-work`. It only creates a branch, so nothing is overwritten.
    5. **Verify**: `git log --oneline rescued-work`, check the files, run the tests.
    6. **Then fix the original problem** with the cookbook (`references/undo-cookbook.md`), using `revert` instead of `reset` on anything pushed.
    
    ## Decision guide
    
    | Question | Answer leads to |
    |----------|-----------------|
    | Was the work ever committed? | Yes: reflog or unreachable commits. No: editor history, backups, or `git fsck --lost-found` for staged blobs |
    | Is the bad commit pushed? | Yes: `git revert`. No: `reset`, `amend` or `rebase` is acceptable |
    | Is the branch shared? | Yes: never rewrite history without agreement |
    | Is a secret involved? | Rotate it first (`secrets-hygiene`) |
    
    ## Rules
    
    - Create a backup branch before any risky command: `git branch backup-before-fix`
    - Prefer commands that add a new commit or branch over commands that delete
    - Say what each command changes before running it, and run destructive ones only after the user confirms
    - Use `--force-with-lease`, never plain `--force`
    - Recovery windows are finite: reflog entries expire, unreachable objects are garbage collected. Act soon.
    - If nothing is found, say so honestly and list what else to check, instead of guessing
    
    ## What to report back
    
    | Field | Content |
    |-------|---------|
    | What happened | the command or event that lost the work |
    | Found | sha, date, subject of the recovered commit |
    | Restored to | branch name, verified how |
    | Remaining risk | uncommitted files, pushed history, expiring entries |
    | Prevention | backup branch habit, `revert` on shared branches |
    
    ## Related skills
    
    - `systematic-debugging`: reflog, bisect and blame for investigation
    - `secrets-hygiene`: when the mistake pushed a credential
    - `termux-setup`: git problems specific to a phone
    

Comments (0)

Sign in to join the conversation.

No comments yet.

Reviews (0)

No reviews yet.