diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-05-31 16:57:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-05-31 16:57:42 -0700 |
commit | f9275c68af58e0f65e1557b5109ccbfdbbbc384a (patch) | |
tree | 7479d66d97277f47490de10e204cfcbc0a123885 /builtin-fetch.c | |
parent | 714cdcd03e2caac6e2dc8d94debc7c800742f546 (diff) | |
parent | df217ed6430efe444a09fffdafd39720ae3f9864 (diff) | |
download | git-f9275c68af58e0f65e1557b5109ccbfdbbbc384a.tar.gz |
Merge branch 'sb/opt-filename'
* sb/opt-filename:
parse-opts: add OPT_FILENAME and transition builtins
parse-opts: prepare for OPT_FILENAME
Conflicts:
builtin-log.c
Diffstat (limited to 'builtin-fetch.c')
-rw-r--r-- | builtin-fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 1eec64e9c4..cd5eb9aff5 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -639,7 +639,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) for (i = 1; i < argc; i++) strbuf_addf(&default_rla, " %s", argv[i]); - argc = parse_options(argc, argv, + argc = parse_options(argc, argv, prefix, builtin_fetch_options, builtin_fetch_usage, 0); if (argc == 0) |