aboutsummaryrefslogtreecommitdiff
path: root/t/t5100/patch0014
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-13 14:12:40 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-13 14:12:41 -0700
commit6680016e9d7450895de11da04921b7ca2818aca2 (patch)
tree8842ce3f203b10bc12a37d2014a74c77b03c4da7 /t/t5100/patch0014
parentf0442976149da225fd9e7796436b2122a6bb7f0f (diff)
parenta08feb8ef0b66c3e7d398ee6169c607b8efb7c80 (diff)
downloadgit-6680016e9d7450895de11da04921b7ca2818aca2.tar.gz
git-6680016e9d7450895de11da04921b7ca2818aca2.tar.xz
Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'
When running "git blame $path" with unnormalized data in the index for the path, the data in the working tree was blamed, even though "git add" would not have changed what is already in the index, due to "safe crlf" that disables the line-end conversion. It has been corrected. * tb/blame-force-read-cache-to-workaround-safe-crlf: correct blame for files commited with CRLF
Diffstat (limited to 't/t5100/patch0014')
0 files changed, 0 insertions, 0 deletions