diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-04 20:52:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-04 20:52:31 +0300 |
| commit | f9712d75e6389866efbe6ad918dc9773a8a880ad (patch) | |
| tree | 7ac7b2ac560e3be83b5131207c47adcd11c17a7b /builtin/remote.c | |
| parent | 23b20fff3ab28b31678d23e67de328ac24801f18 (diff) | |
| parent | c512643e67d33673933fa3d245be28b08b974755 (diff) | |
Merge branch 'jc/parse-options-short-help'
Command line parser fix, and a small parse-options API update.
* jc/parse-options-short-help:
short help: allow a gap smaller than USAGE_GAP
remote: simplify "remote add --tags" help text
short help: allow multi-line opthelp
Diffstat (limited to 'builtin/remote.c')
| -rw-r--r-- | builtin/remote.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 479a5191d4..d91bbe728d 100644 --- 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")), |