Git is a distributed version control system that was created by Linus Torvalds as an improvement over centralized systems like Subversion; it works by tracking changes to files and committing snapshots of changes locally or to a remote server, and has a flexible branching workflow that allows users to work independently and merge changes together. The document provides an introduction to basic Git concepts, commands, and workflows for versioning code and collaborating through branching and merging changes.

1. Introduction to GIT
Boby - Thenetcircle 2010

2. Plan
• Basics
• Workflow
• Roadmap

3. Basics
• What is GIT?
• How does it work?
• Why shall i use GIT?

4. What is GIT?
• Version control system
• Distributed
• Modern
• Created by Linus Torvald

5. Distributed?
• No central repository
• Mostly local
• Remote access
u1 u3
Central
u2
u1 u2 u3
u4

6. Modern
• Fast
• Clean
• Rethink of VCS

7. Usage
• Linux kernel
• Symfony 2
• asOauthPlugin
• Many others on github, gitorious...

8. How?
• Key-value storage
• File based
• Checksum via SHA-1
• Inside the .git folder

10. How?
http://progit.org/book/ch1-3.html

11. How?
http://progit.org/book/ch1-3.html

12. How?
• Commits are snapshots
• Modified files are copied
• Unmodified files keep the same reference

13. How?
Head Head
Change file B
Rev 3AB40 Commit changes Rev 98FD0
Folder 290FF Folder 290FF
File A 343BA File A 343BA
File B FF0934 File B 5589A

14. What about SVN?
• Old, slow, complex
• Merges are a pain!!!
• Merges suck!!!

15. What about others?
• Mercurial, Bazaar... all distributed VCS
• The rest (VSS, CVS...)

16. Basic workflow
• Initialize a repository
• Adding a file

22. Basic workflow
• Modifying a file
• Viewing the difference
• Committing

28. What is this add crap?
• The “index” !!!
• Another step in the workflow
• Act as staging area

29. Basic workflow
http://marklodato.github.com/visual-git-guide/

30. Basic workflow
• Make 2 modifications on the same file
• Commit the first one
• Commit the second one

39. Branch workflow
• Create a new branch
• Modify some stuff
• Commit in this branch

47. Branch workflow
• Merge my new branch back to main
• Commit

54. Branch workflow
• Modify branch test
• Modify branch master
• Merge
• Solve conflict

68. Branch workflow
• Modify branch test
• Modify branch master
• Update test from master

75. Branch workflow
Master Branch test
Branch
Rev 3AB40 Rev 3AB40
Rev AE449 Rev 34E79
Rev CC34F

76. Branch workflow
Master Branch test
Rev 3AB40 Rev 3AB40
Rev AE449 Rev AE449
Rebase
Rev CC34F Rev CC34F
Rev 34E79

77. Update your branch from the main =

78. “git rebase main” =

79. 2 seconds =

80. Holly crap!!!
Awesome!!!
Bye bye SVN!!!

81. Remote workflow
• Checkout a remote branch
• Modify
• Send the modification to the remote

89. External workflow
• git submodule:
- longer workflow
- allows direct co/push
• git subtree
• external dependency manager

90. Dev workflow
• Clone the main branch
• Create branch for feature
• Commit changes inside
• Rebase often to keep the branch up to date
• Push back
• Tell the maintainer to merge your changes

91. Main repo
}
master
git clone
git pull git merge
git pull
remote
server
Boby repo git checkout -b Boby repo
master eflower feat
}
git clone
git pull git push
git rebase
local
Working copy
eflower feat

92. Roadmap
• Install git
• Training
• Transition with git-svn
• Move all branches/script to git
• End of SVN
• Enjoy!

93. Installation?
• Version 1.7 of GIT
• CLI
• tortoise git for designer
• Remote repository with Gitorious

94. Links
• http://progit.org/book/
• http://marklodato.github.com/visual-git-guide/
• http://hginit.com/
• http://git.or.cz/course/svn.html

95. Questions?