summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-22 02:39:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-22 05:24:34 (GMT)
commit96ab4f4e7a0fac1992a1f27ad2dc1106db09a5de (patch)
tree5be36f68e6e38164badcccafcc07b8cb68afcde7
parente64961b0573b0e72bd55eab6d36bd97f859f9516 (diff)
downloadgit-96ab4f4e7a0fac1992a1f27ad2dc1106db09a5de.zip
git-96ab4f4e7a0fac1992a1f27ad2dc1106db09a5de.tar.gz
git-96ab4f4e7a0fac1992a1f27ad2dc1106db09a5de.tar.bz2
Fix "git show --stat"
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--revision.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 113dd5a..f9c7d15 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;