| commit | 44a1020d4d41b90be80745c7a16e2a49fa612b56 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 06:42:10 +0000 (12 22:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 06:42:10 +0000 (12 22:42 -0800) | ||
| tree | fd734df8e43fb1dc956ac045eb0a699d09fb1176 | treesnapshot (tar.gz zip) |
| parent | 1efb73322ad800cc679496124e8a1f498b52e5cb | commitdiff |
| parent | 3f6d56de5f99ec5f0667bef4411f2515b253a5b2 | commitdiff |
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
* 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 |