Merge branch 'jc/cc-stat'

* jc/cc-stat: Fix "git show --stat"
git-mirror · Apr 24, 2006 · 2effe71 · 2effe71
2 parents cdb6350 + 96ab4f4
commit 2effe71
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;