freaking git confusion