Git recovery

Git mistakes are common. This decision tree asks what happened, whether you pushed, and whether you need to keep changes — then gives step-by-step commands with a danger level for each path.

~~~

About this tool

This is not a substitute for reading git help on your exact situation — it covers the "oh no" moments that come up repeatedly: wrong branch, unpushed amend, deleted branch, merge abort, secrets in history.

Pushed commits on shared branches should almost always be fixed with git revert, not reset --hard plus force push. The tree calls that out on every relevant path.

~~~

Related tools

More in Git

.gitignore Generator
Check your stacks (Node, macOS, VS Code, Python, Astro, env files) and copy a commented .gitignore.
Commit Message Builder
Build Conventional Commits messages with live validation, breaking-change footers, and copy-ready one-liners.
Git Command Finder
Search or browse 75+ Git commands by goal — undo commits, branches, remotes, stash — with caution notes for destructive ops.
Semver Advisor
Pick what changed for the correct semver bump (including 0.x rules), plus plain-English explanations for ^ and ~ ranges.
Dependabot & Renovate Config Generator
Create dependency update configuration with schedules, groups, labels, and reviewers.
Git Branch & Rebase Visualizer
Step through merge, fast-forward, rebase, and cherry-pick scenarios on an animated commit graph — see what each command really does.

~~~

Free books, courses, and software

Get my programming books, course editions, and complete software.

Get the download library →

Git recovery

Steps

About this tool

Read more

Free books, courses, and software