Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 06:46:09 +0000 (22:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 06:46:09 +0000 (22:46 -0800)
* maint:
Documentation: clarify -u<mode> option defaults

Trivial merge