Pragmatic Git

How do you balance the need to git commit early+often vs delivering a clean history?

Rebase!

Transcript

1. Pragmatic Git Glenn Roberts CC BY-SA 4.0 @glennrob
3. © 2015 National Council for Law Reporting
4. © 2015 Travel Dave
5. Pragmatic Git Google Maps
11. don’t blame your tools
13. Pragmatic Git Android
14. how to be 10075 minutes EARLY
15. 1. Meetup on the 1st 2. Switch iOS to Android 3. Glance at Android Calendar Icon
16. Last Monday : Yesterday : Monday 23 Monday 30
17. don’t blame your tools
18. git is a flexible tool
20. Should I commit this? Should I mention that? I don't really want anyone to see this…
21. Who changed this? Why? What changed?
22. Authoring Work in parallel History Checkpoints, undo Integrate, Share What changed?
23. Get things done Play nicely with others
24. others
25. 1. Commit often 2. Deliver clean history
26. Commit OFTEN
27. focus on building your feature not crafting commits
28. on a feature branch
29. Private Public Branches vs
30. Public clean linear immutable succinct stable
31. Private mutable unstable checkpoints meaningful now
32. a (private) feature branch
33. lots of intermittent commits
35. You’ll need make sense of it… keep in mind…
36. semantic commit • 'feat: …' • 'fix: …' • 'cosmetic: …' • ‘chore:…’ prefixes
38. private feature branches checkpoints & noise semantic prefixes Recap Commit Often
39. Deliver CLEAN HISTORY
40. Refactor history just like you refactor code
41. "[You are] writing a chronological story not of what happened, but what should happen" Seth Robertson
42. turn your commits into useful patches
43. • single, logical changes • don’t individually regress [master] always stable!
44. No vanilla merges!*
45. choose the right tool
46. [Interactive] rebase is your friend
47. refactor our work, merge others’ work git rebase -i
50. git rebase -i origin/master
52. “Great books aren’t written– they’re rewritten.” Michael Crichton (c/- Ben Sandofsky)
53. “Convert conversations to conclusions” @emmajanehw
54. refactoring interactive rebase commits <> patches Recap Clean History
55. 1. Commit often 2. Deliver clean history Re-Recap
56. Thanks!
57. • Understanding the Git Workflow, Ben Sandofsky • Future Self, XKCD • CSS commit, Austin Allred • Semantic Commits, Jeremy Mack • Telling Stories Through Your Commits, Joel Chippindale • Git Best Practices, Seth Robertson • Git For Teams, Emma Jane Westby • Convert Conversations to Conclusions, Emma Jane Westby • Understanding The Github Flow, Github Acknowledgements