Alex Tercete @alextercete The end of your line-endings nightmare CRLF LF CRLF

CRLF CRLF CRLF CRLF LF LF LF LF

CRLF CRLF CRLF CRLF LF LF LF LF LF LF CRLF CRLF

~/.gitconfig [core] autocrlf = true

No content

CRLF CRLF CRLF CRLF Working directory Objects database LF LF LF LF Commit core.autocrlf = true

CRLF CRLF CRLF CRLF Working directory Objects database LF LF LF LF Checkout core.autocrlf = true

CRLF CRLF CRLF CRLF Working directory Objects database LF LF LF LF Commit core.autocrlf = input

Working directory Objects database LF LF LF LF Checkout LF LF LF LF core.autocrlf = input

Are we there yet?

No!

~/code/repo/.gitattributes * text=auto

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

$ echo "* text=auto" >.gitattributes $ rm .git/index $ git reset $ git add -u $ git add .gitattributes $ git commit -m "Introduce end-of-line normalization"

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

Are we there yet?

NO! NO!

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

$ git checkout $ git rebase master -s recursive -X renormalize

$ git init $ echo "* text=auto" >.gitattributes $ git add .gitattributes $ git commit -m "Initial commit"

Are we there yet?

Yes!

Alex Tercete @alextercete Thanks! LF

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