Gitting Things Done

Presented on March 15 2024 at the Dutch PHP Conference, Amsterdam, The Netherlands.
https://phpconference.nl/session/gitting-things-done/
---------------------------------------------------------------
Git is the modern-day version management system of choice.
We all know how to commit, push, pull and merge. But what about (interactive) rebasing, fixing up commits, cherry picking lines and bisecting the history ?
And what are those atomic commits you keep hearing people talk about ?

Come and learn how to get the most out of the tooling you use every day and leave knowing how to create a clean commit history which is a joy to peruse.

Transcript

1. Gitting Things Done Juliette Reinders Folmer Toot about it: @jrf_nl #DPC24
2. What is Git ? Linnaea Mallette
3. About Forks & Remotes
4. “ There is no limit to the amount of remotes you can add or that can exist Gaborfrom Hungary
5. “ There is no one truth kconnors
6. Original Repo Fork A Fork B
7. Original Repo Fork A Fork B
8. Original Repo Fork A Fork B
9. Original Repo Fork A Fork B
10. Pull I accept your truth as my truth
11. Push My truth is now your truth
12. Pull Request Will you accept my truth as your truth ?
13. Merging a PR Thanks for asking. I accept your truth as my truth
14. About Branches Paul de Bruin
15. Branches are your Save Points
16. COPY/DEL TEMP PR WAIT-FOR WIP TODO Use Branches Liberally
17. How to Write History and Get Your PRs Accepted
18. Useful ?
19. Decypherable ?
20. Clean
21. “ A clean history requires forethought and discipline kconnors
22. Atomic Commits Pass CI Easy to Review Focus on One Thing Self-contained
23. Atomic Commits === Story Telling
24. Tools of The Trade ▪ Amend Steve Buissinne
25. Tools of The Trade ▪ Amend ▪ Interactive Rebase Maria Yan
26. Rebase
27. Rebase
28. Interactive Rebase
29. Interactive Rebase
30. squash pick fixup drop edit reword Interactive Rebase
36. Squash vs Fixup ▪ Combines changes into one commit ▪ Combines the commit messages + presents for edit ▪ Combines changes into one commit ▪ Throws away all but the original commit message
37. About Commit Messages ▪ Short description (title) ▪ Long description: Describe the why's ▪ Reference links ▪ Use proper punctuation! Voiculescu Bogdan
38. Give Credit Where Credit is Due Prefix: description Long description explaining why the changes were made, why they were made in this way. What other solutions were considered and rejected and for what reason. Reference(s): • https://.... Co-authored-by: Contributor Name <email@address.net>
39. Tools of The Trade ▪ Amend ▪ Interactive Rebase ▪ Cherry picking Enrica Bressan
40. Cherry Picking Commits Files Lines
41. Cherry Picking When committing From other commits From other branches
42. K.C. Hohensee
43. To Force Push Or Not To Force Push DO: ▪ Non- collaborative branch, not pulled ▪ Pulled, rebased, no changes MAYBE ▪ Pulled, typo/CS fix DON'T: ▪ Collaborative branch, not pulled ▪ Pulled, review has started
44. When Things Go Wrong
45. Reset vs Revert
46. Reset vs Revert
47. Reset vs Revert
48. Reset vs Revert
49. When Things Go Really Wrong
50. Git Bisect to the Rescue
51. Git Bisect to the Rescue Bad Good
52. Git Bisect to the Rescue Bad Good Good or Bad ?
53. Git Bisect to the Rescue Bad Good Good or Bad ?
54. Git Bisect to the Rescue Bad Good Good or Bad ? Good or Bad ?
55. Git Bisect to the Rescue Bad Good Good or Bad ? Good or Bad ?
56. Git Bisect to the Rescue Bad Good Good or Bad ? Good or Bad ? Good or Bad ?
57. Git Bisect to the Rescue Bad Good Good or Bad ? Good or Bad ? Good or Bad ?
58. Git Bisect to the Rescue Bad Good Good or Bad ? Good or Bad ? Good or Bad ?
59. When Things Go Really Really REALLY Wrong
60. git reflog
61. Keeping Your Codebase Clean Lisandra Barros Mendonça
62. Commit vs Ignore In repo .gitignore .git/info/exclude Composer composer.json composer.lock /vendor/ composer.lock NPM package.json /node_modules/ package-lock.json PHPUnit phpunit.xml.dist phpunit.xml .phpunit.result.cache custom-phpunit.xml IDE of choice /.idea/ OS specific *.bak .Trashes [Tt]humbs.db *.DS_store
63. Keep Distribution Packages Clean # Exclude these files from release archives. /.gitattributes export-ignore /.gitignore export-ignore /phpunit.xml.dist export-ignore /tests/ export-ignore # Auto detect text files and perform LF normalization * text=auto # The above will handle all files NOT found below *.md text .gitattributes
64. Git in Comfort CLI Git Kraken SmartGit Aurees SourceTree GitExtensions GitEye Git Cola
65. Thanks! Any questions ? Slides: https://speakerdeck.com/jrf Feedback: https://joind.in/talk/4f3a8 Feedback: https://joind.in/talk/dafa1 @jrf_nl@phpc.social @jrfnl https://github.com/sponsors/jrfnl