Merge branch 'jc/parse-options-short-help'

[thirdparty/git.git] / builtin / remote.c

diff --git a/builtin/remote.c b/builtin/remote.c
index 479a5191d450a3706cde9330876a3b2724aadc5c..d91bbe728d739e074e5f4fa54f70c186f371c1b7 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -168,10 +168,9 @@ static int add(int argc, const char **argv, const char *prefix)
        struct option options[] = {
                OPT_BOOL('f', "fetch", &fetch, N_("fetch the remote branches")),
                OPT_SET_INT(0, "tags", &fetch_tags,
-                           N_("import all tags and associated objects when fetching"),
+                           N_("import all tags and associated objects when fetching\n"
+                              "or do not fetch any tag at all (--no-tags)"),
                            TAGS_SET),
-               OPT_SET_INT(0, NULL, &fetch_tags,
-                           N_("or do not fetch any tag at all (--no-tags)"), TAGS_UNSET),
                OPT_STRING_LIST('t', "track", &track, N_("branch"),
                                N_("branch(es) to track")),
                OPT_STRING('m', "master", &master, N_("branch"), N_("master branch")),