Merge branch 'mk/diff'
authorJunio C Hamano <junkio@cox.net>
Wed, 25 Apr 2007 05:12:48 +0000 (22:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 25 Apr 2007 05:12:48 +0000 (22:12 -0700)
commit7c9375e7d1c64862c32749dac2fc873fa923ae7c
treeec989a86cff36bed234e077e1997391603338f3b
parentb01c7c0ee3b692055c6026a9e22380d6ad35811b
parent43342941dd736fe06fe607a1594422cc8ba461a1
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