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-config.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-config.c')
| -rw-r--r-- | builtin-config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-config.c b/builtin-config.c index a81bc8bbf0..60915f91ca 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -316,7 +316,8 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix) config_exclusive_filename = getenv(CONFIG_ENVIRONMENT); - argc = parse_options(argc, argv, builtin_config_options, builtin_config_usage, + argc = parse_options(argc, argv, prefix, builtin_config_options, + builtin_config_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (use_global_config + use_system_config + !!given_config_file > 1) { |