From: Junio C Hamano <junkio@cox.net>
Date: Tue, 16 May 2006 06:42:37 +0000 (-0700)
Subject: Merge branch 'se/diff'
X-Git-Tag: v1.4.0-rc1~136
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=638684824c419f4368512c6f54ac32dd4e6c56a6;p=git.git

Merge branch 'se/diff'

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

638684824c419f4368512c6f54ac32dd4e6c56a6
diff --cc diff.h
index bef586d85,70077c6ed..3027974c1
--- a/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;