Merge branch 'se/diff'

* se/diff:
  Convert some "apply --summary" users to "diff --summary".
  Add "--summary" option to git diff.
This commit is contained in:
Junio C Hamano
2006-05-15 23:42:37 -07:00
6 changed files with 96 additions and 6 deletions

3
diff.h
View File

@ -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;