Skip to content

Instantly share code, notes, and snippets.

@caot

caot/ignore-line-endings

Forked from robert-claypool/ignore-line-endings
Created December 5, 2021 03:01
Show Gist options
  • Save caot/83c87be1a409e912fd6f20c832d00791 to your computer and use it in GitHub Desktop.
Save caot/83c87be1a409e912fd6f20c832d00791 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