Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Nov 2010 17:45:16 +0000 (09:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Nov 2010 17:45:16 +0000 (09:45 -0800)
* maint:
Documentation: document show -s
dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout

Trivial merge