Merge branch 'jc/diff' into next

diff --git a/revision.c b/revision.c
index b6ed0149a5c3f34b4747bfcdedf4b2251b0a69ce..3545df6119def92872080a3986e7d6ec3056e28d 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -664,6 +664,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;
                        }