@matheusbsbs / matheus-bagliano / commits / 1aec7917dc
Fork 0

git log: don't do merge diffs by default

I personally prefer "ignore_merges" to be on by default, because quite often the merge diff is distracting and not interesting. That's true both with "-p" and with "--stat" output. If you want output from merges, you can trivially use the "-m", "-c" or "--cc" flags to tell that you're interested in merges, which also tells the diff generator what kind of diff to do (for --stat, any of the three will do, of course, but they differ for plain patches or for --patch-with-stat). This trivial patch just removes the two lines that tells "git log" not to ignore merges. It will still show the commit log message, of course, due to the "always_show_header" part. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Apr 19, 2006 at 10:20 UTC 1aec7917dc52901c6df301ddc8fea70f5ce0db09
1 file changed -2
git.c
-2
@@ -331,8 +331,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
331 init_revisions(&rev);
332 rev.always_show_header = 1;
333 rev.diffopt.recursive = 1;
334 - rev.combine_merges = 1;
335 - rev.ignore_merges = 0;
334 return cmd_log_wc(argc, argv, envp, &rev);
335 }
336