![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Feb 2012 22:08:00 +0000 (14:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Feb 2012 22:08:00 +0000 (14:08 -0800) | ||
| commit | 6c63ab3ca7abc50155acc6c28380435fb79f7fa9 | |
| tree | 61f4f31ceb45e7be429055e9a34df66ba69d7764 | tree | snapshot |
| parent | c6a4e3f7a78011bd7c1c75521c6d12ac311513f7 | commit | diff |
| parent | 3f6d56de5f99ec5f0667bef4411f2515b253a5b2 | commit | diff |
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
* 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 | | blob | history |