Skip to content

Instantly share code, notes, and snippets.

@robert-claypool

robert-claypool/ignore-line-endings

Last active August 21, 2023 15:05
Show Gist options
  • Star 3 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save robert-claypool/6c9812e8c8831e131a12 to your computer and use it in GitHub Desktop.
Save robert-claypool/6c9812e8c8831e131a12 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