Merge branch 'se/diff' into next

* se/diff:
  Convert some "apply --summary" users to "diff --summary".
  Add "--summary" option to git diff.

diff --cc diff.c
Simple merge

diff --cc diff.h
index bef586d,70077c6..3027974
--- 1/diff.h
--- 2/diff.h
+++ b/diff.h
@@@ -31,8 -31,8 +31,9 @@@ struct diff_options 
                 binary:1,
                 full_index:1,
                 silent_on_remove:1,
-                find_copies_harder:1;
+                find_copies_harder:1,
+                summary:1;
 +      int context;
        int break_opt;
        int detect_rename;
        int line_termination;