![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
(merge: fc54a9c 9e30dd7 c4b83e6 6602659 b28858b)
(merge: fc54a9c 9e30dd7 c4b83e6 6602659 b28858b)
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 5 May 2005 23:16:54 +0000 (16:16 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 5 May 2005 23:16:54 +0000 (16:16 -0700) | ||
| commit | 211232bae64bcc60bbf5d1b5e5b2344c22ed767e | |
| tree | cdafa88fa4ed7fcc7bb6c64d62e2d7c4d3b65e42 | tree | snapshot |
| parent | fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc | commit | diff |
| parent | 9e30dd7c0ecc9f10372f31539d0122db97418353 | commit | diff |
| parent | c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a | commit | diff |
| parent | 660265909fc178581ef327076716dfd3550e6e7b | commit | diff |
| parent | b28858bf65d4fd6d8bb070865518ec43817fe7f3 | commit | diff |
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>
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>