Guerilla Git - Welcome to the Jungle

Essentials for surviving git

Transcript

1. Guerilla Git Welcome to the Jungle Monday, February 4, 2013
2. • Getting Started • Basic Git Concepts • Git Commands & Goodies • Git Workflows • Git Tools & Links • Git Questions Monday, February 4, 2013
3. Getting Started • .gitconfig • .gitignore Monday, February 4, 2013
4. Basic Git Concepts Monday, February 4, 2013
5. Basic Git Concepts 3-Stage Workflow Monday, February 4, 2013
6. Monday, February 4, 2013
7. Basic Git Concepts 5 States of a File Monday, February 4, 2013
8. Monday, February 4, 2013
9. Basic Git Concepts Git Storage = DAG (Directed Acyclic Graph) Monday, February 4, 2013
10. Monday, February 4, 2013
11. Basic Git Concepts Commitish + Treeish + Hashes Monday, February 4, 2013
12. Monday, February 4, 2013
13. Basic Git Concepts Recursive Merge Monday, February 4, 2013
14. Monday, February 4, 2013
15. Basic Git Concepts Fast Forward Merge Monday, February 4, 2013
16. Monday, February 4, 2013
17. Basic Git Concepts Conflicting Merge Monday, February 4, 2013
18. Monday, February 4, 2013
19. Basic Git Concepts Rebase Monday, February 4, 2013
20. Monday, February 4, 2013
21. Monday, February 4, 2013
22. Basic Git Concepts Plumbing + Porcelain Monday, February 4, 2013
23. Monday, February 4, 2013
24. Demo Time Monday, February 4, 2013
25. Git Commands & Goodies • git diff • git log • git reflog • git stash • git blame • git mergetool/difftool Monday, February 4, 2013
26. Git Workflows • ALWAYS branch • NEVER work in master • When in doubt, BRANCH Monday, February 4, 2013
27. Git Questions • Quickly review submitted questions • Any new ones you’ve thought of? Monday, February 4, 2013
28. Git Tools & Links • Tower (mac only) • Kaleidoscope 1 (mac only) - diffing • Kaleidoscope 2 (lion+ only) - diffing/ merging • Gitk • Github/Bitbucket/Gitorious/etc. Monday, February 4, 2013
29. Thanks • References + links coming... Monday, February 4, 2013