diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:14 -0700 |
| commit | 7f3ed824a4ec15fc9725a4992b399ea4364c5adb (patch) | |
| tree | 7604efbf6f1b7511449f87a937658d6efa53ddcc /builtin | |
| parent | e2ab0227aab5cdcede3b39e4c95b118f09a71d29 (diff) | |
| parent | b3d83d9f2ef1b0f0f53bb7254e234c743aa42817 (diff) | |
| download | git-7f3ed824a4ec15fc9725a4992b399ea4364c5adb.tar.gz | |
Merge branch 'ar/config-from-command-line'
* ar/config-from-command-line:
Complete prototype of git_config_from_parameters()
Use strbufs instead of open-coded string manipulation
Allow passing of configuration parameters in the command line
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/config.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c index 4bc46b15fd..f3d1660d02 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -197,7 +197,11 @@ static int get_value(const char *key_, const char *regex_) git_config_from_file(show_config, system_wide, NULL); if (do_all && global) git_config_from_file(show_config, global, NULL); - git_config_from_file(show_config, local, NULL); + if (do_all) + git_config_from_file(show_config, local, NULL); + git_config_from_parameters(show_config, NULL); + if (!do_all && !seen) + git_config_from_file(show_config, local, NULL); if (!do_all && !seen && global) git_config_from_file(show_config, global, NULL); if (!do_all && !seen && system_wide) |