git log: don't do merge diffs by default

diff --git a/git.c b/git.c
index 0be14bb487414153d76919f1f36ed78e899042c1..40b7e42ae9f87b5cdc7e2f968bbb12caa8f2d01c 100644 (file)
--- a/git.c
+++ b/git.c
@@ -331,8 +331,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
        init_revisions(&rev);
        rev.always_show_header = 1;
        rev.diffopt.recursive = 1;
-       rev.combine_merges = 1;
-       rev.ignore_merges = 0;
        return cmd_log_wc(argc, argv, envp, &rev);
 }