Leaning Git

Introduction to the team at Totango - a team of SVN users to git.

1. Git Introduction For Subversion Users Ran Tavory Totango Sunday, May 25, 14
2. Why Git? • Because IT IS BETTER Sunday, May 25, 14
3. Git is a File System Sunday, May 25, 14
4. All (most) Operations are Local and Fast! • Commit • Log (view history) • Diff • ... Sunday, May 25, 14
5. Git is Distributed Sunday, May 25, 14
6. Git is Fast Sunday, May 25, 14
7. Lightweight (and local) Branching Sunday, May 25, 14
8. Data Integrity Sunday, May 25, 14
9. Staging Area Sunday, May 25, 14
10. Stash Area Sunday, May 25, 14
11. Sunday, May 25, 14
12. Git Setup $ brew install git $ git config --global user.name “Ran Tavory” $ git config --global user.email “rantav@gmail.com” https://gist.github.com/rantav/ 5d6fb14057f062ecbc70 Sunday, May 25, 14
13. GitHub Setup https://help.github.com/articles/ set-up-git Sunday, May 25, 14
14. Clone the Repo $git clone https://github.com/ totango/main.git Sunday, May 25, 14
15. git status Sunday, May 25, 14
16. git add Sunday, May 25, 14
17. git diff Sunday, May 25, 14
18. git commit Sunday, May 25, 14
19. git commit --amend Sunday, May 25, 14
20. git checkout Sunday, May 25, 14
21. git rm Sunday, May 25, 14
22. git mv Sunday, May 25, 14
23. git log Sunday, May 25, 14
24. git log -p Sunday, May 25, 14
25. git log --word-diff Sunday, May 25, 14
26. git log --stat Sunday, May 25, 14
27. git log hacking Sunday, May 25, 14
28. git remote Sunday, May 25, 14
29. git pull Sunday, May 25, 14
30. rebase or no? • Prefer rebase • this keeps the commit log cleaner •git pl • Sometimes an actual merge is needed • So don’t rebase • For example, when merging branches Sunday, May 25, 14
31. git push Sunday, May 25, 14
32. Git for SVN Sunday, May 25, 14
33. Git for SVN Sunday, May 25, 14
34. Git for SVN Sunday, May 25, 14
35. Git Lifecycle Sunday, May 25, 14
36. The Staging Area (AKA The Index) Sunday, May 25, 14
37. .gitignore Sunday, May 25, 14
38. Learning More Sunday, May 25, 14
39. Bonus: zsh integration Sunday, May 25, 14
40. Not Today: Branching Sunday, May 25, 14
41. Totango Links • Wiki: https://sites.google.com/a/ totango.com/wiki/engineering/git • Repo: https://github.com/totango/main • CI: TODO Sunday, May 25, 14
42. References http://git-scm.com/about http://thkoch2001.github.io/whygitisbetter/ http://www.slideshare.net/manishchaks/subversion- to-git-migration http://www.git-tower.com/blog/git-for-subversion- users-cheat-sheet-detail/ http://git.or.cz/course/svn.html AKA where did I steal from? Sunday, May 25, 14