mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "git show --stat"

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-04-21 19:39:04 -07:00
parent e64961b057
commit 96ab4f4e7a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
revision.c
View File

@ -789,7 +789,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
} }
if (revs->combine_merges) { if (revs->combine_merges) {
revs->ignore_merges = 0; 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.output_format = DIFF_FORMAT_PATCH;
} }
revs->diffopt.abbrev = revs->abbrev; revs->diffopt.abbrev = revs->abbrev;