Skip to content

Instantly share code, notes, and snippets.

@qsLI

qsLI/ignore-line-endings

Forked from robert-claypool/ignore-line-endings
Created October 19, 2018 15:55
Show Gist options
  • Save qsLI/7078e97987792ddba69f7b3b7b6fb428 to your computer and use it in GitHub Desktop.
Save qsLI/7078e97987792ddba69f7b3b7b6fb428 to your computer and use it in GitHub Desktop.
Download ZIP
Ignore Line Endings with Git Merge
Raw
ignore-line-endings
git config merge.renormalize true # prevents unnecessary merge conflicts, http://stackoverflow.com/a/12194759/23566
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment