Rewriting git history

Or: How to cover up your mistakes and code like a boss. Also a beginner's guide to tractor brand determination by color.

Transcript

1. Rewriting git history Or: how to cover up your mistakes Kees Hink, Four Digits and friends Lightning Talks, Arnhem 2019-06-07
2. Use case* What brand tractor is this? * Pun intended.
4. Problem: How dare they?!
5. git checkout -b include-wheel-color
6. Small problem, just a sec! Let’s see if it works
7. Yay fixed it! Oh of course, hang on.
8. Good enough, let’s submit PR
9. Reviewer:
10. Or, more realistic:
11. We understand you’ve been working hard and all that, but now it’s time to clean up.
14. • Use 1 commit for one isolated code change.
15. • Do not use a separate commit to fix a previous commit on the same branch.
16. • Do not rebase a branch if other people work on it.
17. • Cover up your mistakes and code like a boss. That’s all.