and cleanup after another inept git command