]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6bf8426 4d4813a)
Merge branch 'bc/blame-crlf-test' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:46:44 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:46:45 +0000 (11:46 -0700)
commit4d27d8cbc4ac74fee7b64ca9182ad920b958655f
tree54c49a1ccc8e2063ceed1dc20ab7b7ef578a42c7tree | snapshot
parent6bf84263b3be507352f2edc9397e4ca6660be289commit | diff
parent4d4813a52f3722854a54bab046f4abfec13ef6aecommit | diff
Merge branch 'bc/blame-crlf-test' into maint

"git blame" assigned the blame to the copy in the working-tree if
the repository is set to core.autocrlf=input and the file used CRLF
line endings.

* 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.