Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 01:59:09 +0000 (18:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 01:59:09 +0000 (18:59 -0700)
commitec3e38edaac75ed4160d114e62c74b1d1d55c320
treec786a8d3702dd37215145c4bdf4d8dca8aea0578
parent013d7d08533ebc8b58e6e42cfdba28f2f4817be6
parentb35acb53458d0f99ba2400b902980b35e5acc2d3
Merge branch 'master' into next

* master:
  Break down no-lstat() condition checks in verify_uptodate()
  t7400: fix bogus test failure with symlinked trash
  Documentation: clarify the invalidated tree entry format