commit | 2bbea5c8f2242ee798e9bee525b485994a8e5911 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Feb 22 13:10:21 2016 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Feb 22 13:10:21 2016 -0800 |
tree | 87e64824719bf59565685d3c3db09ea9ce31a248 | |
parent | 47847c756b7de9615cf89f353d3d2a84f8a871f1 [diff] | |
parent | 4d552005323034c1d6311796ac1074e9a4b4b57e [diff] |
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