A reworking of gitribution