laoxong/ScoopBucket
1
0
Fork 0
mirror of https://github.com/laoxong/ScoopBucket synced 2024-11-26 20:05:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

(chore): Fix git conflicts with line endings

Browse Source 
Refer https://github.com/ScoopInstaller/Extras/issues/7546
This commit is contained in:
Rashil Gandhi 2022-07-01 10:29:16 +05:30
parent e888bff3e6
commit 38e65c144b
No known key found for this signature in database
GPG Key ID: 0AF22EDF6BE85BBD
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.editorconfig
View File

@ -14,7 +14,3 @@ trim_trailing_whitespace = true
[*.{yml,yaml}] [*.{yml,yaml}]
indent_size = 2 indent_size = 2
[*.{[Bb][Aa][Tt],[Cc][Mm][Dd]}]
# DOS/Win *requires* BAT/CMD files to have CRLF newlines
end_of_line = crlf

6
.gitattributes vendored
View File

@ -1,2 +1,4 @@
# retain windows line-endings in case checked out on mac or linux # Since Scoop is a Windows-only tool, we can safely use CRLF line endings for all text files.
* text eol=crlf # If Git decides that the content is text, its line endings will be normalized to CRLF in the working tree on checkout.
# In the Git index/repository the files will always be stored with LF line endings. This is fine.
* text=auto eol=crlf