Merge branch 'fix'

* fix:
  Document git-clone --reference
  Fix filename scaling for binary files

diff --combined diff.c
index d75e017,903afa1..0a832c3
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -250,13 -250,14 +250,14 @@@ static void show_stats(struct diffstat_
        for (i = 0; i < data->nr; i++) {
                struct diffstat_file *file = data->files[i];
  
+               len = strlen(file->name);
+               if (max_len < len)
+                       max_len = len;
+ 
                if (file->is_binary || file->is_unmerged)
                        continue;
                if (max_change < file->added + file->deleted)
                        max_change = file->added + file->deleted;
-               len = strlen(file->name);
-               if (max_len < len)
-                       max_len = len;
        }
  
        for (i = 0; i < data->nr; i++) {
@@@ -1035,7 -1036,8 +1036,7 @@@ int diff_setup_done(struct diff_option
         * recursive bits for other formats here.
         */
        if ((options->output_format == DIFF_FORMAT_PATCH) ||
 -          (options->output_format == DIFF_FORMAT_DIFFSTAT) ||
 -          (options->with_stat))
 +          (options->output_format == DIFF_FORMAT_DIFFSTAT))
                options->recursive = 1;
  
        if (options->detect_rename && options->rename_limit < 0)