Git by Situation

I already pushed a commit I want to undo

Safely undo a pushed commit by creating a new reverting commit

I committed to the wrong branch

Move your commit to the correct branch

I have a merge conflict — what do I do?

Resolve merge conflicts step by step without panicking

I need to switch branches but have uncommitted changes

Temporarily save your work without committing it

I want to see exactly what changed

Inspect changes at every level — unstaged, staged, or between commits

I accidentally committed a secret or API key

Remove sensitive data from git history — act fast

I want to clean up my messy commits before merging

Squash multiple commits into one clean commit

Should I rebase or merge?

Understanding when to use each approach

I want to discard all my local changes and start fresh

Restore your working directory to match the last commit

How should I structure my branches?

A simple branching strategy that works for most projects

I need to find which commit introduced a bug

Binary search through history to locate the bad commit

I want to fix my last commit message or add a missed file

Amend the most recent commit without creating a new one

I want to tag a release

Create a version tag to mark a specific point in history

How do I contribute to an open source project?

The standard fork-and-PR workflow

First time Git setup — what do I configure?

Essential configuration before your first commit

What should I put in .gitignore?

Essential patterns to prevent committing sensitive or generated files

Git is too verbose — I want shortcuts

Useful git aliases to speed up your daily workflow