reset: support "--mixed --intent-to-add" mode