We’ve been using Git here for a while, but it’s always good to get a best-practice refresher, and some workflow tips and tricks. Lullabot’s Andrew Berry has some good stuff on that front today:
Git is a flexible and powerful version control system. While Git offers significant functionality over legacy centralized tools like CVS and Subversion, it also presents so many options for workflow that it can be difficult to determine what is the best method to commit code to a project. The following are the guidelines I like to use for most software projects contained within a Git repository.