Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:08:00 +0000 (14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:08:00 +0000 (14:08 -0800)
commit6c63ab3ca7abc50155acc6c28380435fb79f7fa9
tree61f4f31ceb45e7be429055e9a34df66ba69d7764
parentc6a4e3f7a78011bd7c1c75521c6d12ac311513f7
parent3f6d56de5f99ec5f0667bef4411f2515b253a5b2
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint

* jc/maint-commit-ignore-i-t-a:
  commit: ignore intent-to-add entries instead of refusing

Conflicts:
cache-tree.c
cache-tree.c