Merge branch 'jc/add-ita'

* jc/add-ita:
  git-add --intent-to-add (-N)

diff --cc cache.h
Simple merge

diff --cc read-cache.c
Simple merge