aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-24 02:06:40 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-24 02:06:40 -0700
commit2effe71b7c3a78cd20070752e04fb04830e4dd36 (patch)
treedcde7082e2303bf572e2964bb3285c3c3be06ca2
parentcdb63506a0d632b4bf81378756b53f30d7198b50 (diff)
parent96ab4f4e7a0fac1992a1f27ad2dc1106db09a5de (diff)
downloadgit-2effe71b7c3a78cd20070752e04fb04830e4dd36.tar.gz
git-2effe71b7c3a78cd20070752e04fb04830e4dd36.tar.xz
Merge branch 'jc/cc-stat'
* jc/cc-stat: Fix "git show --stat"
-rw-r--r--revision.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 113dd5a89..f9c7d15f5 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;