Why aren't you using git-flow? →

Git extensions to provide high-level repository operations for Vincent Driessen’s branching model.