Merge branch 'se/diff'

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

1 files changed, 2 insertions, 1 deletions

diff --git a/diff.h b/diff.h
index bef586d850..3027974c1e 100644
--- a/diff.h
+++ b/diff.h
@@ -31,7 +31,8 @@ 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;