summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/git.c b/git.c
index d5aa41df92..c20ae45bb7 100644
--- 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);
}