summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-04-19 17:20:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-19 18:09:22 (GMT)
commit1aec7917dc52901c6df301ddc8fea70f5ce0db09 (patch)
treeef01805237747580c61c9d9e7e94f9bb62e90e52 /git.c
parentccb365047a1081455b767867f0887e7b4334f9d8 (diff)
downloadgit-1aec7917dc52901c6df301ddc8fea70f5ce0db09.zip
git-1aec7917dc52901c6df301ddc8fea70f5ce0db09.tar.gz
git-1aec7917dc52901c6df301ddc8fea70f5ce0db09.tar.bz2
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>
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 0be14bb..40b7e42 100644
--- a/git.c
+++ b/git.c
@@ -331,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);
}