Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:36:10 +0000 (08:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:36:10 +0000 (08:36 -0700)
* ap/maint-update-index-h-is-for-help:
  update-index: allow "-h" to also display options


Trivial merge