Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1
commit357d7f11ba0e2513c2f8bdcaff66aaf7e1f62a14
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:36:10 +0000 (3 08:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:36:10 +0000 (3 08:36 -0700)
tree42f1457b66f38eead0ac91e118e064a82cf3f517
parenta134a60d0b6a5aaf92b3cfa04279698fdf359e5e
parentb04d930bbcd1dc7cbb4524063ec339a8feb3cc12
Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1

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