![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Nov 2008 23:03:57 +0000 (15:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Nov 2008 23:03:57 +0000 (15:03 -0800) | ||
| commit | 6cd3729eae8d8945c0482423149163d40afd082c | |
| tree | 5a41d37b2d0c5f1ba62ebb6d42901ffe4b26a796 | tree | snapshot |
| parent | 2baf1850ceb01dfbee862e30f2a69cf6064e13eb | commit | diff |
| parent | c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0 | commit | diff |
Merge branch 'maint'
* maint:
Start 1.6.0.5 cycle
Fix pack.packSizeLimit and --max-pack-size handling
checkout: Fix "initial checkout" detection
Remove the period after the git-check-attr summary
Conflicts:
RelNotes
* maint:
Start 1.6.0.5 cycle
Fix pack.packSizeLimit and --max-pack-size handling
checkout: Fix "initial checkout" detection
Remove the period after the git-check-attr summary
Conflicts:
RelNotes
| Documentation/git-check-attr.txt | diff1 | | diff2 | | blob | history |
| builtin-checkout.c | diff1 | | diff2 | | blob | history |
| builtin-pack-objects.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| read-cache.c | diff1 | | diff2 | | blob | history |
| t/t5300-pack-object.sh | diff1 | | diff2 | | blob | history |