Merge branch 'jc/count' into next

diff --git a/revision.c b/revision.c
index ad78efda5183af3f7d98373f3f8c5d7723f46adf..846c9ec463e9b7e4fd2f7b4e41c5ee1aa7a7007c 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -694,6 +694,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strcmp(arg, "-c")) {
                                revs->diff = 1;
+                               revs->dense_combined_merges = 0;
                                revs->combine_merges = 1;
                                continue;
                        }