Introduction to Git Sean Cashin Socialcast

Developer Bob working on integrating in with a new service Does this sound familiar?

Manager Jim found a show stopper bug and needs Developer Bob to fix it ASAP

What to do Git git stash git checkout master Fix the problem git commit git checkout <branch> git stash apply SVN Try to find someone else who has a cleaner working copy Commit changes Find the bug, implement a fix, manually pull out your changes, push to trunk, and finally try to remember all the fixes you just reversed.

git stash

git checkout master

Fix the problem

git commit

git checkout <branch>

git stash apply

Try to find someone else who has a cleaner working copy

Commit changes

Find the bug, implement a fix, manually pull out your changes, push to trunk, and finally try to remember all the fixes you just reversed.

Git enables a developer to follow a more agile development style

Distributed Version Control System Originally made for development on Linux History

Integrating with SVN git-svn: “ Bidirectional operation between a single Subversion branch and git ” Uses the Subversion repository as the central storage among developers Each developer can use their local git repo git svn clone https://longhouse.googlecode.com/svn/trunk longhouse --username=scashin133

Uses the Subversion repository as the central storage among developers

Each developer can use their local git repo

git svn clone https://longhouse.googlecode.com/svn/trunk longhouse --username=scashin133

Developing with Git Small commits Branched features Easy testing More time for code, less for managing it

Small commits

Branched features

Easy testing

More time for code, less for managing it

Helpful Tools & Resources Git manual (http://www.kernel.org/pub/software/scm/git/docs/user-manual.html) git_remote_branch (http://grb.rubyforge.org/): Rubygem that makes it easy to do remote branch management git-auto-complete ( http://gist.github.com/212013 ): bash script for doing tab completion with git branches git-bash-prompt ( http://gist.github.com/212016 ): bash script for showing additional information in shell rake git:* ( http://gist.github.com/212022 ): Used for management of code releases in Socialcast.

Git manual (http://www.kernel.org/pub/software/scm/git/docs/user-manual.html)

git_remote_branch (http://grb.rubyforge.org/): Rubygem that makes it easy to do remote branch management

git-auto-complete ( http://gist.github.com/212013 ): bash script for doing tab completion with git branches

git-bash-prompt ( http://gist.github.com/212016 ): bash script for showing additional information in shell

rake git:* ( http://gist.github.com/212022 ): Used for management of code releases in Socialcast.

SVN to Github: http://github.com/blog/156-subversion-importing

SVN to Github: http://github.com/blog/156-subversion-importing

Questions?