Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2009 21:31:15 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2009 21:31:15 +0000 (14:31 -0700)
* maint:
doc: clarify how -S works

Trivial merge