Make the code work for you with #Git

Slides from my presentation on Java BootCamp #5 about Git.

Java BootCamp #5 took place in Hradec Králové at 8. 11. 2012

http://www.java-bootcamp.cz/cs/bootcamp-5

Transcript

1. Make the code work for you with #Git Tomáš Jukin @Inza
2. Tomáš Jukin @Inza #Objective-C #RubyOnRails #Git
3. A long story short...
4. ...about a SCM tool
5. ...about a SCM tool Source Code Management
6. SCM? Centralized Distributed
7. SCM? Centralized Distributed Git, Mercurial, ... CVS, SVN, ...
8. Why SCM? FTP sucks Mail sucks Dropbox sucks USB drive sucks We NEED to share code! ...and...
9. Why SCM? FTP sucks Mail sucks Dropbox sucks USB drive sucks We NEED to share code! ...and... So?
10. Why SCM? Which SCM?
11. Which SCM? CVS is a history SVN is centralized Mercurial can’t rebase ... Today, we NEED to: ...and... be independant be productive work offline have backup grow
12. Which SCM? CVS is a history SVN is centralized Mercurial can’t rebase ... Today, we NEED to: ...and... So? be independant be productive work offline have backup grow
14. Distributed SCM By geeks around Linux Kernel The most powerful SCM out there
15. Tools Ecosystem Submodules GitHub Rebase Cherry-pick Stash
16. http://git-scm.com/ http://book.git-scm.com/ http://progit.org/book/
17. Workflow Me You
18. Workflow Me You
19. Workflow Me You
20. Workflow
21. Workflow Working Copy
22. Workflow Working Copy
23. Workflow Working Copy Local Repo
24. Workflow Working Copy Local Repo
25. Workflow Working Copy Index (stage) Local Repo
26. Workflow Working Copy Index (stage) Local Repo Remote Local
27. Workflow Working Copy Index (stage) Local Repo Remote Local
28. Workflow Working Copy Index (stage) Local Repo Remote Repo Remote Local
29. Workflow Working Copy Index (stage) Local Repo Remote Repo Remote Local
30. Workflow Working Copy Index (stage) Local Repo Remote Repo add Remote Local
31. Workflow Working Copy Index (stage) Local Repo Remote Repo add Remote Local
32. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit Remote Local
33. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit Remote Local
34. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push Remote Local
35. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push Remote Local
36. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch Remote Local
37. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch Remote Local
38. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch merge Remote Local
39. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch merge Remote Local
40. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch pull or rebase merge Remote Local
41. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch pull or rebase merge Remote Local
42. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch pull or rebase checkout HEAD merge Remote Local
43. Workflow Working Copy Index (stage) Local Repo Remote Repo add commit push fetch pull or rebase checkout HEAD merge Remote Local
44. Workflow Working Copy Index (stage) Local Repo Remote Repo add remove commit push fetch pull or rebase checkout HEAD merge Remote Local
45. Workflow Working Copy Index (stage) Local Repo Remote Repo remove push fetch pull or rebase checkout HEAD merge Remote Local add commit
46. Workflow Working Copy Index (stage) Local Repo Remote Repo remove push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a
47. Workflow Working Copy Index (stage) Local Repo Remote Repo remove push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a add -A
48. Workflow Working Copy Index (stage) Local Repo Remote Repo remove push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a add -A ?
49. Workflow Working Copy Index (stage) Local Repo Remote Repo remove push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a add -A ? status
50. Creation (in code) git clone git@repo.foo.com/foo.git foo_dir cd foo_dir Local Repo mkdir foo_dir cd foo_dir git init ...or...
51. Creation (in code) git clone git@repo.foo.com/foo.git foo_dir cd foo_dir Local Repo mkdir foo_dir cd foo_dir git init ...or... clone url
52. Creation (in code) Remote Repo mkdir foo.git cd foo.git git init --bare
53. Workflow (in code) git add -a git commit -m “Updated foo class” git push
54. Workflow (in code) git add -a git commit -m “Updated foo class” git push
55. Workflow (in code) git pull git fetch git merge bar_branch ...or...
56. Installation Windows msysgit - http://goo.gl/YdToL MacOS brew install git Linux apt-get install git
57. GUI Windows TortoiseGit - http://goo.gl/9Gfhn SmartGit - http://goo.gl/P8QqD MacOS GitX (L) - http://goo.gl/AMiqc Linux Choose yours - http://goo.gl/TebDq
58. Next? git flow “Just one approach to solve branches, releases and versions”
59. Next? Links Interactive Git Cheatsheet - http://goo.gl/8yMZY GitHub - http://github.com semver - http://semver.org git flow (about) - http://goo.gl/MAF6m git flow (CLI tool) - http://goo.gl/IbOJr
60. @Inza Tomáš Jukin @JuicymoCZ