From: Junio C Hamano <junkio@cox.net>
Date: Wed, 25 Apr 2007 05:12:48 +0000 (-0700)
Subject: Merge branch 'mk/diff'
X-Git-Tag: v1.5.2-rc1~30
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7c9375e7d1c64862c32749dac2fc873fa923ae7c;p=git.git

Merge branch 'mk/diff'

* mk/diff:
  Diff between two blobs should take mode changes into account now.
  use mode of the tree in git-diff, if <tree>:<file> syntax is used
  store mode in rev_list, if <tree>:<filename> syntax is used
  add add_object_array_with_mode
  add get_sha1_with_mode
  Add S_IFINVALID mode
---

7c9375e7d1c64862c32749dac2fc873fa923ae7c