]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 312d5b7 4d35f74)
Merge branch 'mb/p4-utf16-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2022 04:52:32 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2022 04:52:32 +0000 (21:52 -0700)
commit4fc4066c4acbf55801d52c1a84a88486f427ed48
tree0c573785112c54e99eaa26037b7313d408ad58d9tree | snapshot
parent312d5b7429508cc339ae66e9d618b4308dd1d1e8commit | diff
parent4d35f744219335d8b32df363891b6336dcf02a6ecommit | diff
Merge branch 'mb/p4-utf16-crlf' into maint

"git p4" working on UTF-16 files on Windows did not implement
CRLF-to-LF conversion correctly, which has been corrected.
source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com>

* mb/p4-utf16-crlf:
  git-p4: fix CR LF handling for utf16 files
Unnamed repository; edit this file 'description' to name the repository.