Skip to content

Latest commit

 

History

History
31 lines (19 loc) · 1.13 KB

README.md

File metadata and controls

31 lines (19 loc) · 1.13 KB

1-Up Your Git Skills

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.

Slides

You can view the slides here, or on SlideShare.

Original Version

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.

Contributing

Found a problem in the slides? Please open a PR or issue!

Development

If you want to run this project locally:

  1. Clone the repo
  2. bundle install
  3. Run bundle exec reveal-ck generate
  4. Run bundle exec reveal-ck serve
  5. Visit http://localhost:10000