Octopus merge of the following five patches.
authorJunio C Hamano <junkio@cox.net>
Thu, 5 May 2005 23:16:54 +0000 (16:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 5 May 2005 23:16:54 +0000 (16:16 -0700)
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>
Trivial merge