diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-22 01:46:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-22 01:46:29 -0700 |
| commit | 1cc4764bc19ef7bb272206d296077cbf1ea34d19 (patch) | |
| tree | 8fae601f9dcbae12eedcb1f7765276623d7ce947 /revision.c | |
| parent | Merge branch 'jc/color' into next (diff) | |
| parent | Fix "git show --stat" (diff) | |
| download | tgif-1cc4764bc19ef7bb272206d296077cbf1ea34d19.tar.xz | |
Merge branch 'jc/cc-stat' into next
* jc/cc-stat:
Fix "git show --stat"
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 113dd5a89f..f9c7d15f56 100644 --- a/revision.c +++ b/revision.c @@ -789,7 +789,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch } if (revs->combine_merges) { revs->ignore_merges = 0; - if (revs->dense_combined_merges) + if (revs->dense_combined_merges && + (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT)) revs->diffopt.output_format = DIFF_FORMAT_PATCH; } revs->diffopt.abbrev = revs->abbrev; |