Merge branch 'maint'
commit6f10c4103dc7506623f89520ad03517b40788259
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Nov 2010 17:45:16 +0000 (9 09:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Nov 2010 17:45:16 +0000 (9 09:45 -0800)
tree76db51024713f6ef191928a8445d48d39ab55434
parent3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e
parent60aa9cf8f370b69eb7feaad2e1cbcd04280bc799
Merge branch 'maint'

* maint:
  Documentation: document show -s
  dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout