Octopus merge of the following five patches.
commit211232bae64bcc60bbf5d1b5e5b2344c22ed767e
authorJunio C Hamano <junkio@cox.net>
Thu, 5 May 2005 23:16:54 +0000 (5 16:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 5 May 2005 23:16:54 +0000 (5 16:16 -0700)
treecdafa88fa4ed7fcc7bb6c64d62e2d7c4d3b65e42
parentfc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc
parent9e30dd7c0ecc9f10372f31539d0122db97418353
parentc4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a
parent660265909fc178581ef327076716dfd3550e6e7b
parentb28858bf65d4fd6d8bb070865518ec43817fe7f3
Octopus merge of the following five patches.

  Update git-apply-patch-script for symbolic links.
  Make git-prune-script executable again.
  Do not write out new index if nothing has changed.
  diff-cache shows differences for unmerged paths without --cache.
  Update diff engine for symlinks stored in the cache.

Signed-off-by: Junio C Hamano <junkio@cox.net>