unpack-trees(): carry skip-worktree bit over in merged_entry()

diff --git a/builtin-tag.c b/builtin-tag.c
index 165bec3069cbb31025258a0c20d61158482025ed..a51a6d1ea21412f151238e48984bc13110fcbc6c 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -375,8 +375,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
        struct commit_list *with_commit = NULL;
        struct option options[] = {
                OPT_BOOLEAN('l', NULL, &list, "list tag names"),
-               { OPTION_INTEGER, 'n', NULL, &lines, NULL,
-                               "print n lines of each tag message",
+               { OPTION_INTEGER, 'n', NULL, &lines, "n",
+                               "print <n> lines of each tag message",
                                PARSE_OPT_OPTARG, NULL, 1 },
                OPT_BOOLEAN('d', NULL, &delete, "delete tags"),
                OPT_BOOLEAN('v', NULL, &verify, "verify tags"),