Merge branch 'dl/warn-tagging-a-tag'

Typofix.

* dl/warn-tagging-a-tag:
tag: fix typo in nested tagging hint

diff --combined builtin/tag.c
index 1debd3a11c2ec0aa44fa75ebd908f78a46f371a1,16b59c45cfdc3637effc33342c405bf66ac8da0c..ef37dccf864932a31c019775cdad6d33207941a1
--- 1/builtin/tag.c
--- 2/builtin/tag.c
+++ b/builtin/tag.c
@@@ -207,7 -207,7 +207,7 @@@ struct create_tag_options 
  };
  
  static const char message_advice_nested_tag[] =
-       N_("You have created a nested tag. The object referred to by your new is\n"
+       N_("You have created a nested tag. The object referred to by your new tag is\n"
           "already a tag. If you meant to tag the object that it points to, use:\n"
           "\n"
           "\tgit tag -f %s %s^{}");
@@@ -408,7 -408,8 +408,7 @@@ int cmd_tag(int argc, const char **argv
                OPT_FILENAME('F', "file", &msgfile, N_("read message from file")),
                OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")),
                OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
 -              OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"),
 -                      N_("how to strip spaces and #comments from message")),
 +              OPT_CLEANUP(&cleanup_arg),
                OPT_STRING('u', "local-user", &keyid, N_("key-id"),
                                        N_("use another key to sign the tag")),
                OPT__FORCE(&force, N_("replace the tag if exists"), 0),
@@@ -422,7 -423,8 +422,7 @@@
                OPT_WITHOUT(&filter.no_commit, N_("print only tags that don't contain the commit")),
                OPT_MERGED(&filter, N_("print only tags that are merged")),
                OPT_NO_MERGED(&filter, N_("print only tags that are not merged")),
 -              OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
 -                           N_("field name to sort on"), &parse_opt_ref_sorting),
 +              OPT_REF_SORT(sorting_tail),
                {
                        OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
                        N_("print only tags of the object"), PARSE_OPT_LASTARG_DEFAULT,