Code

Merge branch 'jc/maint-commit-ignore-i-t-a'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:10 +0000 (22:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:10 +0000 (22:42 -0800)
commit44a1020d4d41b90be80745c7a16e2a49fa612b56
treefd734df8e43fb1dc956ac045eb0a699d09fb1176
parent1efb73322ad800cc679496124e8a1f498b52e5cb
parent3f6d56de5f99ec5f0667bef4411f2515b253a5b2
Merge branch 'jc/maint-commit-ignore-i-t-a'

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

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