Geecon 2011 - Git: a Gentle InTroduction (new version)

3. Concepts

4. Working locally

5. Remote operations

6. Enterprise adoption

7. Q&A

9. XP Coach during 2k

10. Co-founder and coordinator of JUG Torino

11. Java Champion since 2005

12. Manager at Gitenterprise.com

13. Working as contractor across Europe

14. About version control Picture courtesy of globalnerdy.com All rights kindly reserved

16. SVN Picture courtesy of progit.org. All rights kindly reserved

18. Mercurial

19. Bazaar Picture courtesy of progit.org. All rights kindly reserved

20. Concepts

22. Nearly every operation is local

23. Integrity is a priority

24. The “three states”

28. Browsing, changing, search happens locally

29. Almost everything doable without network

30. the db is a nice, separate .git folder :)

33. Git generally only adds data

35. staged

36. committed

37. all local operations! Picture courtesy of progit.org. All rights kindly reserved

39. Initializing a local repository

40. Managing files

41. Looking into history

42. Local operations

45. commit

46. tree

47. …and other stuff :)

48. After a commit... Picture courtesy of progit.org. All rights kindly reserved

49. After three commits... Picture courtesy of progit.org. All rights kindly reserved

50. A branch is a pointer Picture courtesy of progit.org. All rights kindly reserved

58. Remote operations

60. sometimes one main r/w, other r/o,

63. http(s)

67. Initial clone Picture courtesy of progit.org. All rights kindly reserved

71. I do some work... Picture courtesy of progit.org. All rights kindly reserved

72. Someone else pushes! Picture courtesy of progit.org. All rights kindly reserved

73. Synchronize with fetch Picture courtesy of progit.org. All rights kindly reserved

78. Most of the time it's a piece of cake

79. Any conflict not resolved automarically must be resolved... by you (as usual!)

81. Then adds all the changes committed on the source other branch

82. Then adds your commits on top

83. Rebase! After a rebase,,, Picture courtesy of progit.org. All rights kindly reserved

85. Much cleaner history

86. Branches are then easy to integrate to the master

88. Fetching from a remote

89. Merging and rebasing

90. Enterprise adoption

92. no way to restrict the access to a repository

93. no way to lock a branch

94. no audit

95. you can commit in behalf of someone else

97. administration is a pain (again based on the OS services)

98. Only basic repository visualization (and nothing on the remote)

100. gitosis (requires *nix os)

102. Github-fi (guess what? now called github enterprise)

103. …not much more here :)

104. Questions?

105. Thanks! Twitter: @bbossola Email: [email_address]