Code

Merge branch 'se/diff' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 00:12:37 +0000 (17:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 00:12:37 +0000 (17:12 -0700)
commit5fd51c77faeb362a5429061e595371b7a1c46c02
tree151c00470194f143f7ae10cb2379f625627253f4
parentaf3d7a6a729f0763ca0f93b5d1ef33d571ef4e8d
parent9d76812b42009069aa3ff8f29e51b5150aa04e8e
Merge branch 'se/diff' into next

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