From: Junio C Hamano <junkio@cox.net>
Date: Thu, 5 May 2005 23:16:54 +0000 (-0700)
Subject: Octopus merge of the following five patches.
X-Git-Tag: v0.99~634^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=211232bae64bcc60bbf5d1b5e5b2344c22ed767e;p=git.git

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>
---

211232bae64bcc60bbf5d1b5e5b2344c22ed767e