The end of your line-endings nightmare

See: https://github.com/search?q=line+endings&type=Commits

Transcript

1. Alex Tercete @alextercete The end of your line-endings nightmare CRLF LF CRLF
2. CRLF CRLF CRLF CRLF LF LF LF LF
3. CRLF CRLF CRLF CRLF LF LF LF LF LF LF CRLF CRLF
4. ~/.gitconfig [core] autocrlf = true
6. CRLF CRLF CRLF CRLF Working directory Objects database LF LF LF LF Commit core.autocrlf = true
7. CRLF CRLF CRLF CRLF Working directory Objects database LF LF LF LF Checkout core.autocrlf = true
8. CRLF CRLF CRLF CRLF Working directory Objects database LF LF LF LF Commit core.autocrlf = input
9. Working directory Objects database LF LF LF LF Checkout LF LF LF LF core.autocrlf = input
10. Are we there yet?
11. No!
12. ~/code/repo/.gitattributes * text=auto
13. Objects database CRLF CRLF CRLF CRLF LF LF LF LF CRLF CRLF LF LF LF LF LF LF LF LF LF LF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF CRLF
14. $ echo "* text=auto" >.gitattributes $ rm .git/index $ git reset $ git add -u $ git add .gitattributes $ git commit -m "Introduce end-of-line normalization"
15. Objects database LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF
16. Are we there yet?
17. NO! NO!
18. Objects database LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF LF CRLF CRLF CRLF CRLF CRLF CRLF LF LF
19. $ git checkout <branch> $ git rebase master -s recursive -X renormalize
20. $ git init $ echo "* text=auto" >.gitattributes $ git add .gitattributes $ git commit -m "Initial commit"
21. Are we there yet?
22. Yes!
23. Alex Tercete @alextercete Thanks! LF
24. References Mind the End of Your Line http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/ Dealing with line endings https://help.github.com/articles/dealing-with-line-endings/ gitattributes Documentation https://git-scm.com/docs/gitattributes