Merge branch 'jc/diff--cached'
authorJunio C Hamano <junkio@cox.net>
Thu, 14 Dec 2006 07:55:42 +0000 (23:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 14 Dec 2006 07:55:42 +0000 (23:55 -0800)
commit67bed724f2736925f84edd0aaaf371fea83dddc2
treedaf4ea3b01d11cea1122447226a37230152a9434
parent62e1aeabc095a02fd3fb7ef46a6884d76da5ce67
parentf2dd1c9adfe961ea611545b018bc67e5d83ee3db
Merge branch 'jc/diff--cached'

* jc/diff--cached:
  Revert "git-diff: Introduce --index and deprecate --cached."