]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ee82139 4d4813a)
Merge branch 'bc/blame-crlf-test'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:26:50 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:26:50 +0000 (11:26 -0700)
commite934c67b6683c1bd504646647b7ee04ee0d9e15b
treeaedcc0fc5925cafdd9150701fbceb19f1b5fa901tree | snapshot
parentee8213951a36cefabed7dd653965cffb6aee628ecommit | diff
parent4d4813a52f3722854a54bab046f4abfec13ef6aecommit | diff
Merge branch 'bc/blame-crlf-test'

If a file contained CRLF line endings in a repository with
core.autocrlf=input, then blame always marked lines as "Not
Committed Yet", even if they were unmodified.

* bc/blame-crlf-test:
  blame: correctly handle files regardless of autocrlf
builtin/blame.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.