Merge branch 'jc/unresolve' into next

diff --git a/git.c b/git.c
index 0c40773a87b81b123b7ef3053dfd59f836b96a04..447d86cd571bcc06b06c64a8713c7dd3c3e1a4f5 100644 (file)
--- a/git.c
+++ b/git.c
@@ -368,8 +368,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);
 }