Merge branch 'ap/maint-update-index-h-is-for-help' into next
commit1d7d180f6992035e1d96e1ce97549134cb38b622
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:05 +0000 (19 15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:05 +0000 (19 15:57 -0700)
tree1c9f3c36e2b5e13d2fdb0c7eed70e0a7a085191d
parentad3aae3a2c6e69b580185f4d68f0073818c2f492
parentb04d930bbcd1dc7cbb4524063ec339a8feb3cc12
Merge branch 'ap/maint-update-index-h-is-for-help' into next

"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