From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Mar 2013 19:42:42 +0000 (-0700)
Subject: Merge branch 'ap/maint-update-index-h-is-for-help' into maint
X-Git-Tag: v1.8.2.1~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6201eb3e65ae6bc9cd14f3497cd3ca12ffc8fbd3?hp=06d7abb13c1a948f376f05bbd708712c512e6e1b

Merge branch 'ap/maint-update-index-h-is-for-help' into maint

"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
---

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);