Good, brief, discussion of the various git workflow options available http://alblue.bandlem.com/2011/12/git-tip-of-week-forking-and-pulling-vs.html