projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git log: don't do merge diffs by default
[git.git]
/
git.c
diff --git
a/git.c
b/git.c
index
0be14bb
..
40b7e42
100644
(file)
--- 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);
}