adopt new git behaviour