projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
t1300-repo-config: two new config parsing tests.
[git.git]
/
revision.c
diff --git
a/revision.c
b/revision.c
index
c6e8702
..
f8ee38e
100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-694,6
+694,7
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
}
if (!strcmp(arg, "-c")) {
revs->diff = 1;
+ revs->dense_combined_merges = 0;
revs->combine_merges = 1;
continue;
}