References: Rebase, deeper

Primary sources

• Pro Git (Scott Chacon, Ben Straub), 2nd edition: Chapter 3 §3.6 “Rebasing” for plain rebase fundamentals, Chapter 7 §7.6 “Rewriting History” for interactive rebase, fixup, and the published-history rule. Available free at git-scm.com/book. The canonical text. Licensed under Creative Commons Attribution Non Commercial Share Alike 3.0 Unported.
• Git official documentation: the git-rebase(1) man page. Authoritative for all action keywords, flags, and edge cases including --autosquash, --rebase-merges, --exec, and the recovery commands.

Further reading

• “Git Interactive Rebase, Squash, Amend and Other Ways of Rewriting History”: common community guide, multiple versions on the major git-blog platforms (Atlassian, GitLab, GitHub). Useful for visual learners who want screenshots of the editor flow.
• “The Magit Manual” (the Emacs git interface): explains interactive rebase via an alternative interface that some people find more intuitive than the text-editor todo list. Even if you don’t use Emacs, the conceptual write-up is illuminating.
• “Reflog: your last line of defense”: community write-ups on reflog recovery patterns. Worth reading once to internalize that reflog has your back for 90 days.
• “Force-with-lease: the only force-push you should use”: community blog posts on the safety pattern. Mostly preaches to the choir but useful for sharing with teammates.

How this lesson uses sources

L12’s interactive-rebase mechanics, action keywords, and recovery patterns follow Pro Git Chapter 7 directly. The fixup-and-autosquash workflow is synthesized from the Pro Git §7.6 coverage plus community blog posts on the proactive-cleanup pattern. The “don’t rebase published history” rule is universal across all git references and is repeated here with team-cost framing original to this lesson.

The multi-agent foreshadowing (lead-rebases-agent-commits-at-integration) is original to this track and gets fleshed out in L14.

License note

This lesson is original content for the T7 track. Pro Git is licensed under Creative Commons Attribution Non Commercial Share Alike 3.0 Unported and its concepts are freely usable for educational purposes; this lesson does not reproduce Pro Git text verbatim but builds on its mental models. Git command syntax is from the public domain Git documentation.

This lesson is part of the Clawdemy curriculum, licensed under Creative Commons Attribution NonCommercial Share Alike 4.0 International. Commercial use is licensed separately at /legal/licensing.