The Mental Model Behind Every Git Command

Git tracks three things: commits, which are snapshots of your project at a point in time; branches, which are movable pointers to a commit; and a staging area, a holding zone for changes before they become part of a commit. Almost every confusing command makes more sense once you ask which of those three things it's actually touching. A command that moves a branch is just repointing a label. A command that rewrites history is creating new commits and abandoning old ones.

The Handful of Commands That Cover Most Days

In practice, most day-to-day git work is some combination of checking status, staging changes, committing, pulling, pushing, and switching branches. Everything else, the merge conflict resolution, the rebase, the cherry-pick, comes up rarely enough that looking it up each time is completely normal, not a sign you don't know git.

Amend, Reset, and Revert Are Not the Same Thing

These three get confused constantly because they all sound like undo, but they do different things. Amend changes the most recent commit, replacing it with a new version. Reset moves a branch pointer backward, and depending on the mode, can discard changes entirely. Revert creates a brand-new commit that undoes a previous one, leaving history intact. If you only remember one distinction: amend and reset rewrite history, revert adds to it.

Knowing Which Commands Are Safe to Run Blind

Commands that only read information, checking status, viewing logs, diffing changes, are safe to run without thinking twice. Commands that discard or overwrite anything, a hard reset, a forced checkout, a forced push, deserve a pause and a second look at exactly what's about to happen, especially if anyone else has already pulled the branch you're about to rewrite.

Common Git Mistakes (And How to Undo Them)

• ✓Committing to the wrong branch, usually fixable by moving the commit to the correct branch and resetting the wrong one
• ✓Force-pushing over a branch someone else is also working on, overwriting their commits
• ✓Running a hard reset before realizing the changes weren't actually saved anywhere else
• ✓Amending a commit that's already been pushed and shared, which rewrites history other people now have a stale copy of

Letting a Helper Translate Plain English to Commands

A git command helper is useful exactly where the panic usually sets in: describe what you're trying to do in plain English and get back the actual command, plus an explanation of what it does before you run it. That explanation matters more than the command itself for anything destructive, since understanding the blast radius is the whole point. For the complete picture beyond any one command, the official Git documentation at https://git-scm.com/docs covers every flag and edge case the helper won't go into.

If the thing you're trying to untangle is less about the git command and more about understanding code you're looking at in an unfamiliar branch, our code explainer covers that side of it.