Why aren't you using git-flow?
In January of this year, @nvie published “A successful Git branching model” , in which he explained how he keeps his Git repositories nice and tidy. In addition to that, he released git-flow ; a bunch of Git extensions to make following this model extremely easy. I’m astounded that some people never heard of it before, so in this article I’ll try to tell you why it can make you happy and cheerful all day. After installing git-flow, you can start a new repository in the current directory or convert an existing one to the new branch structure: $ git flow init It will ask you a bunch of questions, but you probably want to accept the default values: No branches exist yet. Base branches must be created now. Branch name for production releases: [master] Branch name for "next release" development: [develop] How to name your supporting branch prefixes? Feature branches? [feature/]...
Full article:
http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-...