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
This commit is contained in:
Junio C Hamano 2013-04-03 08:36:10 -07:00
commit 357d7f11ba

View File

@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
}; };
if (argc == 2 && !strcmp(argv[1], "-h")) if (argc == 2 && !strcmp(argv[1], "-h"))
usage(update_index_usage[0]); usage_with_options(update_index_usage, options);
git_config(git_default_config, NULL); git_config(git_default_config, NULL);