Merge branch 'ap/maint-update-index-h-is-for-help' into next
commitf5f767cb2915833423ae4f19f8b7bb68d0ab29e6
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 18:33:04 +0000 (25 10:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 18:33:04 +0000 (25 10:33 -0800)
tree94ec2aa5cfa497e6469eea62d9b37aed5d3d98ae
parentc9bd6d33ed10489821ba2a3f2299aeac2613521b
parentb04d930bbcd1dc7cbb4524063ec339a8feb3cc12
Merge branch 'ap/maint-update-index-h-is-for-help' into next

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