Intro to Git for the Python Hacker

A gentle introduction to git for a python programmer

Transcript

1. Intro to Git! for Python Hackers! ! ! Mark Allen! mrallen1@yahoo.com! @bytemeorg! http://byte-me.org! https://github.com/mrallen1!
2. Distributed ! Version ! Control! System!
3. Fast! !
4. Tons of features! !
5. Pervasive use in the community!
6. Worst. Interface. Evar.!
7. 1.  Terms and lingo! 2.  Basic workflow! 3.  Topic branches! 4.  Starting and/or contributing to github projects.! 5.  Cool Python stuff!
8. Terms / Lingo http://marklodato.github.com/visual-git-guide/index-en.html!
9. Terms / Lingo http://marklodato.github.com/visual-git-guide/index-en.html!
10. Basics subversion! ! $ svn co \! https://example.com! $ vim myfile.py! $ svn status! $ svn diff! $ svn ci -m'My commit'! git! ! $ git clone \! https://example.com! $ vim myfile.py! $ git status! $ git add -- myfile.py! $ git diff! $ git commit \! -m'My commit'! $ git push!
11. Basics ! $ git clone https://example.com! $ vim myfile.py! $ git diff! $ git add myfile.py ! $ git status! $ git commit -m'My commit'! $ git push origin master! origin   Where   What  
12. I want to...! !create a new local repository! $ mkdir myproject! $ cd myproject! $ git init! Basics
13. I want to...! ! ! !copy a remote repository! ! $ git clone https://example.com! $ git clone git@example.com:project.git! Basics
14. I want to...! ! ! !stage a file for a commit! ! $ git add -- myfile.py! Basics
15. I want to...! create a commit! ! $ git commit! Basics
16. I want to...! add to the last commit! ! $ git commit --amend! Basics
17. I want to...! ! ! diff against a commit! ! $ git diff! $ git diff HEAD^! $ git diff HEAD~4! $ git diff 1bc38 -- myfile.py! Basics
18. I want to...! ! ! ! see commit history! ! $ git log! Basics
19. I want to...! ! ! !update a local repository! ! $ git pull! Basics
20. I want to...! give a commit a memorable reference! ! $ git tag mytag 1bec3! $ git push --tags! $ git diff mytag -- a.py! Basics
21. I want to...! add a remote storage location! ! $ git remote add origin https://example.com! ! -also-! ! $ git remote rm origin! Basics
22. I want to...! push my local work to a remote location! ! $ git push! $ git push -u origin foo! Basics
23. I want to...! temporarily save my work
 and work on something else! $ git stash! # ...! $ git stash pop! Basics
24. Git commands ! •  are (mostly) scripts! •  bash, python, perl! •  you can extend!
25. Topic branches! ! •  What are they?! •  Why are they useful?! •  How do you use them?! Topic branches
26. $ git branch rt14322! $ git checkout rt14322! -or-! $ git checkout -b rt14322! ...! Topic branches
27. $ git checkout master! $ git merge rt14322! Topic branches
28. GitHub
29. GitHub
30. GitHub https://github.com/signup/free!
31. GitHub
32. GitHub
33. GitHub
34. GitHub
35. GitHub
36. GitHub
37. GitHub
38. GitHub
39. GitHub
40. GitHub
41. GitHub
42. GitHub
43. GitHub
44. GitHub
45. GitHub
46. GitHub
47. GitHub
48. GitHub
49. GitHub
50. GitHub
51. GitHub
52. GitHub
53. GitHub
54. GitHub
55. GitHub
56. GitHub
57. GitHub
58. GitHub
59. GitHub Congratulations, your pull request was submitted!! ! Things to do now:! • Relax! • Have a tasty beverage! • Enjoy the accolades of a grateful Python community!
60. Augh! My library is in CVS or SVN!! •  I'm sorry for your pain.! •  Github has tools and guides to help you migrate!
61. Cool Python Stuff! •  dulwich, a pure python git implementation! •  GitPython, wraps git command line tools! •  Legit, a more humane git CLI (by Kenneth Reitz)! Python
62. Cool Python Stuff! •  pygit2 - Python binding for libgit2 (an alternative C implementation)! •  git-cola - a graphical git client written in Python! Python
63. Thank you!! Questions?!