Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2008 23:03:57 +0000 (15:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2008 23:03:57 +0000 (15:03 -0800)
* 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

1  2 
Documentation/git-check-attr.txt
builtin-checkout.c
builtin-pack-objects.c
cache.h
read-cache.c
t/t5300-pack-object.sh

Simple merge
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge
Simple merge