Skip to content

Commit 38c2545

Browse files
committed
Normalize line endings
This git repo uses LF line endings in committed trees. But the prior .gitattributes setting told git to never regard any file as text so line endings would not be normalized. The result: depending on the configuration and/or OS of the git clone, line endings could be changed and an entire text file could appear changed in a PR, causing merge conflicts. With this change, git will detect text files and normalize their line endings to LF to avoid this problem.
1 parent 556517d commit 38c2545

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
* -text
1+
#* -text
2+
* text=auto

0 commit comments

Comments
 (0)