From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Nov 2010 17:45:16 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~153
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f10c4103dc7506623f89520ad03517b40788259?ds=inline;hp=--cc

Merge branch 'maint'

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

6f10c4103dc7506623f89520ad03517b40788259