git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-19 02:22:21 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
18a4b8d9f83ef1448363b55673624da170e4d3bf
git/Documentation/gitattributes.txt
Junio C Hamano 7f5885ad2a Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint 
"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.

* jc/renormalize-merge-kill-safer-crlf:
  merge: avoid "safer crlf" during recording of merge results
  convert: unify the "auto" handling of CRLF
2016-09-08 21:35:52 -07:00

34 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink