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
f8809cb6fc2bc46df4fd8751b6059cd7af92fa16
git/read-cache.c
Junio C Hamano 21bed620cd Merge branch 'jc/renormalize-merge-kill-safer-crlf' 
"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-07-25 14:13:39 -07:00

62 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink