summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-04 06:54:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-04 06:54:34 (GMT)
commit230f544e877641666f8c3718ac4563294c2b305e (patch)
treeae2c574c6c8384b7b379aff52c035a7b953ff084 /revision.c
parent6b16250a4551682b026b2592e44077ffa5fbdf2a (diff)
parent8ab99476ec2298a43e94949e0bb7aa5125793a28 (diff)
downloadgit-230f544e877641666f8c3718ac4563294c2b305e.zip
git-230f544e877641666f8c3718ac4563294c2b305e.tar.gz
git-230f544e877641666f8c3718ac4563294c2b305e.tar.bz2
Merge branch 'jc/diff'
* jc/diff: builtin-diff: call it "git-diff", really. builtin-diff.c: die() formatting type fix. built-in diff: assorted updates. built-in diff.
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index c6e8702..f8ee38e 100644
--- 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;
}