diff --git a/builtin/log.c b/builtin/log.c index e37c27ab7e..0cdd88971d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -637,6 +637,10 @@ static void log_setup_revisions_tweak(struct rev_info *rev, /* Turn --cc/-c into -p --cc/-c when -p was not given */ if (!rev->diffopt.output_format && rev->combine_merges) rev->diffopt.output_format = DIFF_FORMAT_PATCH; + + /* Turn -m on when --cc/-c was given */ + if (rev->combine_merges) + rev->ignore_merges = 0; } int cmd_log(int argc, const char **argv, const char *prefix)