Merge branch 'jc/push-cas'

diff --git a/builtin/config.c b/builtin/config.c
index da12fdba969a38f9afe2a581d3853df30d783c65..4ab9e9a550ddf06f3822cea78689a60fd802f8d2 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -50,9 +50,9 @@ static int respect_includes = -1;
 
 static struct option builtin_config_options[] = {
        OPT_GROUP(N_("Config file location")),
-       OPT_BOOLEAN(0, "global", &use_global_config, N_("use global config file")),
-       OPT_BOOLEAN(0, "system", &use_system_config, N_("use system config file")),
-       OPT_BOOLEAN(0, "local", &use_local_config, N_("use repository config file")),
+       OPT_BOOL(0, "global", &use_global_config, N_("use global config file")),
+       OPT_BOOL(0, "system", &use_system_config, N_("use system config file")),
+       OPT_BOOL(0, "local", &use_local_config, N_("use repository config file")),
        OPT_STRING('f', "file", &given_config_file, N_("file"), N_("use given config file")),
        OPT_STRING(0, "blob", &given_config_blob, N_("blob-id"), N_("read config from given blob object")),
        OPT_GROUP(N_("Action")),