• git tips
• Setup
• Doing work
• Getting someone else's work
• Getting work into master
• What's a pull request?
• What's a fork?
• Resolving Merge / Rebase conflicts
• The ps-next branch
• GUI tools
• Make your mac command line awesome