Merge branch 'js/diff'

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

diff --cc diff.c
index 2dcad1942c0f5137d93ebf709439eb385a4ae500,9dbbed75bac4143f36811c3351aea6c71abcf554..33153787b8117396cf906e69e656849ac04f3257
--- 1/diff.c
--- 2/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;
        /*