Merge branch 'nd/reset-intent-to-add'
commit8336832ad99832d21e5ee588bd3d03369048c05a
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:40 +0000 (27 14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:40 +0000 (27 14:01 -0800)
tree787d8c70b31315c46780323e95c3cc713a961914
parent795dd116bb655f8aa8c206ecaf415527871cb7a6
parentb4b313f94ab06fabe78fa91b3f2ebbc7ef08b012
Merge branch 'nd/reset-intent-to-add'

* nd/reset-intent-to-add:
  reset: support "--mixed --intent-to-add" mode
cache.h
read-cache.c