7 Git Tips & Tricks, by jub0bs

Lightning talk (10 minutes) given at Rebel Con 2017 (Cork, Ireland)

Transcript

1. 7 Tips & Tricks Julien Cretel @_jubobs_ Jubobs Jubobs
2. 12 years ago…
3. 1 - Useful analogies commit ≈
4. 1 - Useful analogies staging ≈
5. 1 - Useful analogies branch
6. 1 - Useful analogies tag
7. 1 - Useful analogies HEAD ≈
8. 2 - Learn Git in the CLI
9. 3 - Listen to the diffs
10. 3 - Listen to the diffs
11. 3 - Listen to the diffs
12. 3 - Listen to the diffs
13. 3 - Listen to the diffs
14. 3 - Listen to the diffs
15. 4 - Small, logical commits
16. 4 - Small, logical commits
17. 4 - Small, logical commits
18. 5 - Clean up your history
19. 5 - Clean up your history • git commit --amend • git rebase -i <ref>
20. 6 - reflog: your safety net
21. 6 - reflog: your safety net
22. 7 - Repository forensics
23. 7 - Repository forensics • git log --grep=“bugfix” • git log --author=Kevin • git blame -- RebelConTalk.java • git shortlog -sn
24. 7 - Repository forensics
25. 7 Tips & Tricks Julien Cretel @_jubobs_ Jubobs Jubobs