git-merge-one-file: fix longstanding stupid thinko

diff --git a/builtin-fetch.c b/builtin-fetch.c
index 55f611e3c26e55df43eca1f40df74d335c850cc0..b2b9935ed65cfa80daf9f9071a3dd5d381ef3426 100644 (file)
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -40,6 +40,8 @@ static struct option builtin_fetch_options[] = {
                    "force overwrite of local branch"),
        OPT_SET_INT('t', "tags", &tags,
                    "fetch all tags and associated objects", TAGS_SET),
+       OPT_SET_INT('n', NULL, &tags,
+                   "do not fetch all tags (--no-tags)", TAGS_UNSET),
        OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
        OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
                    "allow updating of HEAD ref"),