Git Workshop

Support slides from my workshop at Code Oasis Ltd, Herzelyah

Transcript

1. Git Jonathan Bensaid
2. Git Model
3. Just Snapshots
4. The 3 states
5. Branches are pointers
6. Branches are pointers
7. Branches are pointers
8. What can we learn? • Each commit contains the entire project • Branches are cheap to use • If we delete a branch we don’t loose anything!!!
9. Git Commands
10. • History with git log • Undoing things (reset, revert, reflog) • Branches • Tags • Remote
11. Merge and Rebase
12. Merge
13. Merge
14. Rebase
15. Fast Forward
16. Demo • 1 Merge • 1 Rebase • 1 Fast Forward
17. Flows
18. Git Flow
19. Git Flow • Standard • Tested • Complete • Overkill
20. @couac flow
21. @couac flow • Inspired from Github flow • Simple • Adapted to small/medium teams (20 persons in github)
22. Team standards • PSR1 and PSR2 • Always one line at the end of the file • Endlines: • linux/mac: core.autocrlf = input • window: core.autocrlf = true
23. Trailing whitespaces are evil, don’t commit evil to your repo
24. Trailing whitespaces are evil!
25. Trailing whitespaces are evil!
26. Team Standards • Don’t merge every time you pull a branch... • Give useful comments to your commits • Fix bug • Name of the file
27. Resources • http://git-scm.com/book • http://scottchacon.com • http://williamdurand.fr/2012/01/17/ my-git-branching-model/ • https://help.github.com • http://codeimpossible.com/ 2012/04/02/Trailing-whitespace-is-
28. Bonus • http://pages.github.com • http://jekyllbootstrap.com • fork me on github!