Merge branch 'jc/attributes-checkout' into next
commit90521aa80311d1e4e6c18d4cba6f3f1d8dee1f81
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700)
tree32daa533490b453e6b56e789f3c2db8165c5eca6
parent6262885daf28d39ab712273bc9a34399499ea7e0
parentb997045e01c2f12ac7dc44c487915f8e50da4d4d
Merge branch 'jc/attributes-checkout' into next

* jc/attributes-checkout:
  Add a test for checking whether gitattributes is honored by checkout.
  Read attributes from the index that is being checked out
unpack-trees.c