Merge branch 'mr/hpux' into maint

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index eb1e3e7467ac722f4b6cc1da03f7671d21abc676..93c92814cf28855aee87cabf4a3b906e11a36125 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -104,12 +104,12 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
        struct unpack_trees_options opts;
        int prefix_set = 0;
        const struct option read_tree_options[] = {
-               { OPTION_CALLBACK, 0, "index-output", NULL, "FILE",
-                 "write resulting index to <FILE>",
+               { OPTION_CALLBACK, 0, "index-output", NULL, "file",
+                 "write resulting index to <file>",
                  PARSE_OPT_NONEG, index_output_cb },
                OPT_SET_INT(0, "empty", &read_empty,
                            "only empty the index", 1),
-               OPT__VERBOSE(&opts.verbose_update),
+               OPT__VERBOSE(&opts.verbose_update, "be verbose"),
                OPT_GROUP("Merging"),
                OPT_SET_INT('m', NULL, &opts.merge,
                            "perform a merge in addition to a read", 1),