Distributed Version
Control with git
Kerry Buckley

git
• What is it?
• Why is it different?
• What can I do with it?
• How can I use git if my project uses svn?
• What alternatives exist?

Caveats
• I’ve only been using it for a few weeks
• Just scratching the surface
• I may be doing it all wrong
• For all I know it may be eating all my files
when I’m not looking
• ...but I like it so far :-)

History
rcs cvs svn git

History
rcs cvs svn git
Alice Repository Bob
Versioning of individual files. Files must be locked before commit. No automatic merging.

History
rcs cvs svn git
Alice Repository Bob
Versioning of individual files. No locking. Automatic merging.

History
rcs cvs svn git
Alice Repository Bob
Versioning of entire project. No locking. Automatic merging.

History
rcs cvs svn git
Alice Bob
Each user has his own repository. No [need for a] central repository.

Some Advantages
• No reliance on central repository
• Offline commits
• Local branching
• Merging that doesn’t suck
• Flexible collaboration
• Interoperates with svn

Alternatives
• Mercurial (hg)
• Better Windows support
• Bazaar (bzr)
• Darcs

Links
• http://git.or.cz/
• http://icanh.as/git/tutorials?
• https://github.com/

Demo