diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-05 16:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-05-05 16:16:54 -0700 |
| commit | 211232bae64bcc60bbf5d1b5e5b2344c22ed767e (patch) | |
| tree | cdafa88fa4ed7fcc7bb6c64d62e2d7c4d3b65e42 | |
| parent | fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc (diff) | |
| parent | 9e30dd7c0ecc9f10372f31539d0122db97418353 (diff) | |
| parent | c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a (diff) | |
| parent | 660265909fc178581ef327076716dfd3550e6e7b (diff) | |
| parent | b28858bf65d4fd6d8bb070865518ec43817fe7f3 (diff) | |
| download | git-211232bae64bcc60bbf5d1b5e5b2344c22ed767e.tar.gz | |
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>