I don't know if it's the git way or not, but I learned with subversion, so I treat master as unstable and make a new maintenance branch for each release. So what I'm saying is: more than just one production branch. That way you can test the next release on its own branch without freezing trunk and without affecting the current production branch (suppose you want to roll back to the previous release?)
