X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=f8ee38e54d52661cf91842e9f2fd14f74983a5d6;hb=e686eb9870d6b382f0760e3e859e93c8c2dfb31b;hp=c6e8702f380ccb9be914ae7608e9f6c3ec77d796;hpb=935e714204fe167aa6172a733e7131ee5b4577f4;p=git.git

diff --git a/revision.c b/revision.c
index c6e8702f..f8ee38e5 100644
--- 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;
 			}