| commit | e0040cf0691ca0a64a7dce517150be9c307bb8fb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 22:23:51 +0000 (10 14:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 22:23:51 +0000 (10 14:23 -0800) | ||
| tree | 54f4048491daee1c56b07c8192c229a0d8065f92 | treesnapshot (tar.gz zip) |
| parent | 4bff88f921f71ade7e29d1c7567173da930c74f2 | commitdiff |
| parent | 3f6d56de5f99ec5f0667bef4411f2515b253a5b2 | commitdiff |
Merge branch 'jc/maint-commit-ignore-i-t-a' into next
* jc/maint-commit-ignore-i-t-a:
commit: ignore intent-to-add entries instead of refusing
Conflicts:
cache-tree.c
* jc/maint-commit-ignore-i-t-a:
commit: ignore intent-to-add entries instead of refusing
Conflicts:
cache-tree.c
| cache-tree.c | diff1 | diff2 | blobhistory |