I agree that squashing all of the commits for a feature together loses a lot of information. I usually follow a workflow similar to the one described, except wi

I agree that squashing all of the commits for a feature together loses a lot of information. I usually follow a workflow similar to the one described, except without this squashing step. That is: 1. Branch off of master to work on the feature. 2. Work, work, work, commit, commit, commit 3. Pull down any updates to master 4. Rebase the feature on master without squashing the commits 5. Merge the feature branch back to master 6. Push up to the shared repository