TechSkribble logoTechSkribbleBuy
Courses & conceptsGitJava
Theme
Buy courses

Browse Skribbles

Unlock all of Git

$99$79 USD

Buy GitAlready bought? Sign in
← All courses
Git
Where Your Work Lives
  • You Already Do Version Control
  • Git: A Time Machine for a Folder
  • What Git Is (and Is Not)
  • Getting Git Onto Your Machine
  • Snapshots, not diffs
  • The Verbs You Will Keep Using
  • A Commit Holds Your Whole Folder
  • One File, Three Moments
  • Git's Three Areas
  • What a Commit Really Is
  • History Is a Graph
  • Where Your Work Lives
  • Beads on a Thread
Inside .git: the Object Store
  • The Prompt Shows Where You Stand
  • Blobs, Trees, Commits
  • Content Addressing
  • A Branch Is Just a Name
  • HEAD: Where You Are Standing
  • Inside .git: the Object Store
The Daily Loop
  • A Timeline Is Born
  • git init & git clone - Two Ways to Get a Repository
  • git add & git commit - Saving in Two Steps
  • git status - What Differs, and Where
  • git add -p, -A, and . - Choosing What You Stage
  • git commit -m and -a - The Sealing Controls
  • git diff - Three Comparisons, One Command
  • git log - Walking History, Three Lenses
  • git show - One Commit Under the Lamp
  • .gitignore - Telling Git What to Leave Alone
  • git commit --amend - Redo the Last Commit
  • The Daily Loop
  • Reading Your Repository
Undo Without Fear
  • git restore - Put a File Back
  • restore --staged & --source
  • git reset - Walk the Branch Back
  • git revert - Undo by Adding
  • The Revert Travels With the Merge
  • git reflog - Where HEAD Has Been
  • What Git Can Never Bring Back
  • Undo Without Fear
  • The Rescue Playbook
Timelines
  • git branch & git switch: Name First, Move Second
  • git switch -c and --detach: Two Ways to Move
  • git checkout: The Old Master Key
  • Fast-forward: The Merge With No Merge Commit
  • The Three-Way Merge: One Commit, Two Parents
  • git log Prints a List. History Is a Graph.
  • Merge Conflict: Git Asking a Question
  • Two Panes Compare, Three Panes Rule
  • The Ruling Desk: Both Moved One Line
  • Rulings Beyond One Line
  • git merge Arguments: -m, --no-ff, --abort
  • Rebase vs Merge: Two Endings for a Stale Desk
  • git rebase --onto: The Transplant
  • Pull Request = Merge Request
  • Timelines
  • How Merging Works
Remote Repositories
  • git remote - Naming the Server Copy
  • git fetch: The Mail Arrives, Held
  • git fetch vs git pull - Look First, Then File It In
  • git pull: Fetch, Then File It In
  • git push - The Refusal Is Protection
  • git push --force-with-lease - The Safer Force
  • The Pull Request Loop - Branch, Push, Review, Merge
  • "Your Branch Is Behind" - Behind and Ahead, Decoded
  • Remote Repositories
  • The Collaboration Loop
The Sharp Tools
  • git cherry-pick - Copy One Commit's Change
  • git bisect - Find the Breaking Commit by Halving
  • git stash - Park Half-Done Work
  • git tag - A Name That Does Not Advance
  • git rebase -i - Rewrite a Run of Commits
  • The Sharp Tools
Reading a Merge Conflict
  • The Merge View: Three Panes, One Ruling
  • Merge Conflicts Have Shapes
  • Reading Conflict Markers
  • Resolving: Four Moves, One Exit Door
  • The Rebase Flip: ours Is Not Yours
  • A Clean Merge Can Still Be Wrong
  • Reverting a Merge: the Dead End
  • Never Resolve on the Release Line
  • Reading a Merge Conflict
  • Merging on a Team
Repository Archaeology
  • Your IDE's History Views Are Git Queries
  • git log Can Answer for One File - Even Across a Rename
  • log A..B Asks the Graph. diff A B Compares Snapshots.
  • git blame: Who Last Touched Every Line
  • Compare Any Two Moments, Any Time
  • Back-Merge, Forward-Merge: Two Directions
  • Repository Archaeology
Choosing Your Strategy
  • Git Flow - Five Lanes, Fixed Jobs
  • Trunk-Based - One Line, Tiny Branches
  • Release Branches - Supporting Old Versions
  • Stabilization Flow - Bugfix vs Hotfix
  • Choosing a Branching Strategy
  • Choosing Your Strategy
One Archive, Many Desks
  • Worktrees - The Practice Run
  • One Archive, Many Desks
Reference
  • The House Words
  • What This Course Did NOT Cover
  • The Whole Course on One Line
  • Reading the Manual - the Decoder Ring
Topics/Git/Undo Without Fear
beginnerFree

Undo Without Fear

four tools, one map: what each one touches, and the line none of them can cross

Open the chapter at full size ↗

Watch

The narrated version of this skribble — tap play for the full-size video.

@techskribble
0:00 / 2:12
Video qualityKeep the details clear.
Playback speedFind your learning pace.
← PreviousWhat Git Can Never Bring BackNext →The Rescue Playbook

More in Undo Without Fear

You've reached the end of this skribble — here's what's next in this module.

git restore - Put a File Back
🔒

git restore - Put a File Back

copy a clean version of one file back onto your desk - history never moves

beginnerPremium
restore --staged & --source
🔒

restore --staged & --source

--staged empties the tray (the staging area), desk untouched; --source pulls any bead's copy OVER your desk

beginnerPremium
git reset - Walk the Branch Back
🔒

git reset - Walk the Branch Back

HEAD and your branch walk back to an older commit - a mode dial decides the fate of staging and desk

beginnerPremium
git revert - Undo by Adding
🔒

git revert - Undo by Adding

a new commit whose change is the exact inverse of a bad one - history only ever grows

beginnerPremium
© 2026 TechSkribble · hard concepts, one skribble at a time.
TermsPrivacyDisclaimerRefunds