git

# git + svn based on http://learn.github.com/p/git-svn.html
sudo apt-get install git-svn
git svn clone file:///Users/blair/git-svn/SVNROOT git_repo

# git ignore
vim .gitignore_global
  *.iml
  *.ipr
  *.iws
git config --global core.excludesfile ~/.gitignore_global

git diff origin/master