Merge branch 'fix'

diff --git a/git.c b/git.c
index 016fa30d37ed343609e5d3fd8ec43881de91f561..40b7e42ae9f87b5cdc7e2f968bbb12caa8f2d01c 100644 (file)
--- a/git.c
+++ b/git.c
@@ -276,8 +276,6 @@ static int cmd_help(int argc, const char **argv, char **envp)
        return 0;
 }
 
-#define LOGSIZE (65536)
-
 static int cmd_log_wc(int argc, const char **argv, char **envp,
                      struct rev_info *rev)
 {
@@ -333,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);
 }