From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Oct 2006 05:09:03 +0000 (-0700)
Subject: Merge branch 'js/diff'
X-Git-Tag: v1.4.4-rc1~84
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65606f3530b2d93eb522fdd1a66970a2b252ae94;p=git.git

Merge branch 'js/diff'

* js/diff:
  Turn on recursive with --summary
---

65606f3530b2d93eb522fdd1a66970a2b252ae94
diff --cc diff.c
index 2dcad1942,9dbbed75b..33153787b
--- a/diff.c
+++ b/diff.c
@@@ -1758,8 -1740,8 +1758,9 @@@ int diff_setup_done(struct diff_option
  	 * recursive bits for other formats here.
  	 */
  	if (options->output_format & (DIFF_FORMAT_PATCH |
 +				      DIFF_FORMAT_NUMSTAT |
  				      DIFF_FORMAT_DIFFSTAT |
+ 				      DIFF_FORMAT_SUMMARY |
  				      DIFF_FORMAT_CHECKDIFF))
  		options->recursive = 1;
  	/*