$ 0 0 committing and branching is cheap with git so stop worrying about it : split your features into small bricks and commit early and often.