summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-03 08:36:10 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-03 08:36:10 -0700
commit357d7f11ba0e2513c2f8bdcaff66aaf7e1f62a14 (patch)
tree42f1457b66f38eead0ac91e118e064a82cf3f517 /builtin
parenta134a60d0b6a5aaf92b3cfa04279698fdf359e5e (diff)
parentb04d930bbcd1dc7cbb4524063ec339a8feb3cc12 (diff)
downloadgit-357d7f11ba0e2513c2f8bdcaff66aaf7e1f62a14.tar.gz
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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/update-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index ada1dff846..5c7762eef4 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
};
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);