Avoid committing commented-out code -- instead, just remove it. Using Git means you can always go back and retrieve code from past commits if needed.