git confusion rectified