git rebase -i HEAD~25
summary
Uses git rebase -i HEAD~25 to rewrite the last 25 commits: reorder, squash, edit files mid-commit and change messages to make history tell intent instead of the messy journey. Demonstrates git fetch + git reset --hard for a clean start, using git push --force-with-lease safely, aborting a rebase to recover, and git cherry-pick to move a hotfix from a feature branch into main. Shows an Apple Pay refactor example and when to isolate bugfix commits.
AI-written summary · about
chapters (10)
- 0:00Intro
- 0:50Disclaimer
- 2:32git repo
- 4:13pull
- 8:39rebase
- 10:12interactive rebase
- 13:32clean up
- 14:45refactoring
- 16:11unrelated fixes
- 17:31Summary
