Don't include commented out code in your commits. If you want to temporarily disable something just delete it. With git you can always go back and pull it from a previous commit, nothing is ever really lost. Having lots of commented out code makes the whole project more cluttered and harder to read.