git gud - Clean History Craftsman

Clean History Craftsman is a themed challenge pack for git gud that hands you the senior engineer's review queue at CleanCode Co., where every pull request is supposed to tell a story and the junior team keeps writing horror fiction. Typo'd messages, "fix fix fix" chains, debug spam, WIP noise, and commits in baffling order arrive on your desk every morning. Your job is to make each branch read like it was written right the first time.

This content pack features twelve story-driven Git scenarios built around a fully simulated repository and command-line environment. Each challenge is a real branch from a real teammate, wrapped in a narrative that explains why the history matters as much as the code, and not just which commands to type.

Working through the review queue, you will:

Amend a commit to fix a typo before it is enshrined in every future release note

Reword a commit called "stuff" into a message a future developer can actually use

Squash a trail of fix-up commits into the single change reviewers came to read

Reorder commits so tests never land before the code they cover

Drop a "TEMP: debug logging everywhere" commit out of history entirely

Use fixup to fold a correction in and leave its embarrassing message behind

Rebase a stale feature branch onto today's main for clean, linear history

Work through a rebase conflict and understand why a paused rebase is not a failed one

Teach Git a recurring conflict resolution once with rerere and never solve it again

Split one commit carrying two unrelated ideas into two commits that each carry one

Mark fixes at the moment you make them with commit --fixup, then let --autosquash arrange the rebase for you

Like the base game, Clean History Craftsman implements Git behavior as faithfully as possible: real amends, real interactive rebase todo lists, real conflict states, and real rerere recording. Nothing here is an abstract puzzle standing in for the genuine commands.

The final challenge is the whole review queue in one branch. A finished feature arrives with a WIP experiment buried in the middle and its commits in the wrong order, and nobody tells you which operations to reach for. You fold, reorder, and continue until three clean commits are left, then ship it.

This DLC is ideal for players who already understand Git basics and want the history-rewriting fluency that separates a tidy pull request from a messy one, because history is not what happened, it is what you publish.