diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-03 23:54:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-03 23:54:34 -0700 |
| commit | 230f544e877641666f8c3718ac4563294c2b305e (patch) | |
| tree | ae2c574c6c8384b7b379aff52c035a7b953ff084 /revision.c | |
| parent | 6b16250a4551682b026b2592e44077ffa5fbdf2a (diff) | |
| parent | 8ab99476ec2298a43e94949e0bb7aa5125793a28 (diff) | |
| download | git-230f544e877641666f8c3718ac4563294c2b305e.tar.gz git-230f544e877641666f8c3718ac4563294c2b305e.tar.xz | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.c b/revision.c index c6e8702f3..f8ee38e54 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; } |