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)
* jc/diff--cached:
  Revert "git-diff: Introduce --index and deprecate --cached."


Trivial merge