Cover of Git Made Crystal Clear
← Back to the series

Git

Made Crystal Clear

By Christophe Paka · Updated August 11, 2026

A practical, visual guide to version control with Git

Prefer it on your Kindle, or on paper? Same book, on Amazon.

Give feedback

Who this book is for

In plain words: Git keeps every version of your files, so you can go back in time, try ideas safely, and work on the same project with other people.

  • Developers who use Git but don't really understand it
  • Students and career changers learning to code
  • Data people and writers who want version control
  • Not for: Not for you if you mainly want pull requests and teamwork on GitHub. Try GitHub Made Crystal Clear.

Git is the tool every developer touches daily and few truly understand. This guide swaps memorized incantations for a clear mental model, so you can branch, merge, rebase, and recover with total confidence, explained visually and hands-on.

Pages
74
Level
Beginner to advanced
Updated
August 11, 2026

12 real pages. Click a page to enlarge it.

Page 10: snapshots vs diffs
Page 11: centralized vs distributed
Page 20: init starts an empty repo in the current folder; clone copies a remote repo with its
Page 25: branches on the commit DAG
Page 26: fast-forward vs three-way merge
Page 36: merge vs rebase, the same divergence resolved two ways
Page 38: interactive rebase, three small work-in-progress commits squashed into one clean commit
Page 42: reset --soft moves only the branch pointer; --mixed also resets the index; --hard also
Page 44: a bad reset --hard moves HEAD back to B, but commit C is still reachable through its
Page 48: feature-branch and pull-request flow: branch off main , commit, open a PR for review,
Page 49: trunk-based (short-lived branches merged often, ideal for CI/CD) vs Git Flow
Page 54: git bisect halves the range each round: mark the ends good and bad, test the midpoint,

Inside the book

  1. 01What Git Is, and Why It Won
  2. 02Core Concepts: The Three Trees and the Object Model
  3. 03Getting Started: Install, Configure, First Commit
  4. 04Branching and Merging Without Fear
  5. 05Working with Remotes
  6. 06Rewriting History: Amend, Rebase, Interactive Rebase
  7. 07Undo Anything: Restore, Reset, Revert, Reflog, Stash
  8. 08Collaboration Workflows
  9. 09Power Tools and Scale
  10. 10Cheat Sheet and Learning Path

You'll leave with

  • The Git mental model: snapshots, the commit graph, and the three trees
  • Branch, merge, and resolve conflicts without fear
  • Rewrite history safely with rebase, amend, and interactive rebase
Christophe Paka, author of Git Made Crystal Clear

About the author

Christophe Paka writes every book on the shelf. He spent years in technical support at Salesforce and Microsoft, where the job was to make complex systems clear to customers who needed them working the same day. He has since built and run software as a founder and lead developer, worked as a Salesforce consultant, and grown a YouTube channel on tech careers past one million views.

This book was last updated on August 11, 2026.

Connect on LinkedIn →

For teams

Put Git on every desk at your company.

One licence, every book in the series, one link for everyone. From $250 a year.

See the team licences

New books, in your inbox

One short note when a new Made Crystal Clear guide ships.
No spam, unsubscribe anytime.