aboutsummaryrefslogtreecommitdiff
path: root/git-merge-one-file-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-22 21:24:49 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-23 11:49:30 -0700
commit60896c7bfed67f1c7364595213ef9239642f83c5 (patch)
tree01c56ae444ab86d7df74664e04ac4d55e9658791 /git-merge-one-file-script
parentc1bb93502012b710ec5a31dff62d4aca7bf51adc (diff)
downloadgit-60896c7bfed67f1c7364595213ef9239642f83c5.tar.gz
git-60896c7bfed67f1c7364595213ef9239642f83c5.tar.xz
[PATCH] Be careful with symlinks when detecting renames and copies.
Earlier round was not treating symbolic links carefully enough, and would have produced diff output that renamed/copied then edited the contents of a symbolic link, which made no practical sense. Change it to detect only pure renames. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'git-merge-one-file-script')
0 files changed, 0 insertions, 0 deletions