{"thread":{"id":"3921","subject":"git log: don't do merge diffs by default","startedAt":"2006-04-19T17:20:49Z","lastAt":"2006-04-19T17:20:49Z","messageCount":1,"participants":["Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18882","messageId":"Pine.LNX.4.64.0604191015150.3701@g5.osdl.org","threadId":"3921","inReplyTo":null,"subject":"git log: don't do merge diffs by default","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-04-19T17:20:49Z","receivedAt":"2006-04-19T17:20:49Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\nI personally prefer \"ignore_merges\" to be on by default, because quite \noften the merge diff is distracting and not interesting. That's true both \nwith \"-p\" and with \"--stat\" output.\n\nIf you want output from merges, you can trivially use the \"-m\", \"-c\" or \n\"--cc\" flags to tell that you're interested in merges, which also tells \nthe diff generator what kind of diff to do (for --stat, any of the three \nwill do, of course, but they differ for plain patches or for \n--patch-with-stat).\n\nThis trivial patch just removes the two lines that tells \"git log\" not to \nignore merges. It will still show the commit log message, of course, due \nto the \"always_show_header\" part.\n\nSigned-off-by: Linus Torvalds <torvalds@osdl.org>\n---\ndiff --git a/git.c b/git.c\nindex 0be14bb..40b7e42 100644\n--- a/git.c\n+++ b/git.c\n@@ -331,8 +331,6 @@ static int cmd_log(int argc, const char \n \tinit_revisions(&rev);\n \trev.always_show_header = 1;\n \trev.diffopt.recursive = 1;\n-\trev.combine_merges = 1;\n-\trev.ignore_merges = 0;\n \treturn cmd_log_wc(argc, argv, envp, &rev);\n }\n \n"}]}