In this talk, I present the two main schools of thought on git commit history. We also talk in-depth about the three PR merge options in the GitHub interface (merge, squash & merge, rebase & merge) in detail.
This presentation was created with reveal-ck.
You can view the slides here, or on SlideShare.
This is a revamped version of a talk I gave in 2015. If you want to view that talk, please check out the v1 branch.
The first version walks through a lot more of the specifics of local rebasing and squashing. If you don't use GitHub, or want to dive deeper on how to squash / rebase locally, check it out.
Found a problem in the slides? Please open a PR or issue!
If you want to run this project locally:
- Clone the repo
bundle install- Run
bundle exec reveal-ck generate - Run
bundle exec reveal-ck serve - Visit http://localhost:10000