X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=revision.c;h=4381d455e4579fb2c6c598cee5e9252277590b28;hb=334b506a3487f762493d3db2d3053114f25590e3;hp=f2a9f25fe11f3883281ea5fdd783700056fd5c6e;hpb=69bcc43eca0f251617e3b5db5df632b24db94e92;p=git.git diff --git a/revision.c b/revision.c index f2a9f25fe..4381d455e 100644 --- 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; }