Merge branch 'ap/maint-update-index-h-is-for-help' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:42:42 +0000 (12:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:42:42 +0000 (12:42 -0700)
"git update-index -h" did not do the usual "-h(elp)" thing.

* ap/maint-update-index-h-is-for-help:
update-index: allow "-h" to also display options

Trivial merge