Merge branch 'nd/reset-intent-to-add'

* nd/reset-intent-to-add: reset: support "--mixed --intent-to-add" mode

Junio C Hamano committed Feb 27, 2014 at 14:01 UTC 8336832ad99832d21e5ee588bd3d03369048c05a

No changes.