Note: this is a summary of different git workflows putting together to a small git bible. references are in between the text
Try to keep your hacking out of the master and create feature branches. The [feature-branch workflow][4] is a good median between noobs (i have no idea how to branch) and git veterans (let's do some rocket science with git branches!). Everybody get the idea!