tree 87e64824719bf59565685d3c3db09ea9ce31a248
parent 47847c756b7de9615cf89f353d3d2a84f8a871f1
parent 4d552005323034c1d6311796ac1074e9a4b4b57e
author Junio C Hamano <gitster@pobox.com> 1456175421 -0800
committer Junio C Hamano <gitster@pobox.com> 1456175421 -0800

Merge branch 'nd/ita-cleanup' into maint

Paths that have been told the index about with "add -N" are not
quite yet in the index, but a few commands behaved as if they
already are in a harmful way.

* nd/ita-cleanup:
  grep: make it clear i-t-a entries are ignored
  add and use a convenience macro ce_intent_to_add()
  blame: remove obsolete comment