Merge branch 'sv/first-parent'

[git.git] / builtin-log.c

diff --git a/builtin-log.c b/builtin-log.c
index 80a01f8d44a40608e989b1cc1973a28c0b9040a5..9d046b2e035bfa6ae63d6d004e5a92072a202d70 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -485,6 +485,13 @@ static int git_format_config(const char *var, const char *value)
                fmt_patch_suffix = xstrdup(value);
                return 0;
        }
+       if (!strcmp(var, "format.cc")) {
+               if (!value)
+                       return config_error_nonbool(var);
+               ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
+               extra_cc[extra_cc_nr++] = xstrdup(value);
+               return 0;
+       }
        if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
                return 0;
        }