diff options
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/combine-diff.c b/combine-diff.c index 12764fb733..f9975d2c2e 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1396,7 +1396,8 @@ void diff_tree_combined(const unsigned char *sha1,  	if (show_log_first) {  		show_log(rev); -		if (rev->verbose_header && opt->output_format) +		if (rev->verbose_header && opt->output_format && +		    opt->output_format != DIFF_FORMAT_NO_OUTPUT)  			printf("%s%c", diff_line_prefix(opt),  			       opt->line_termination);  	} | 
