itssoap/ScoopInstaller_Main
1
0
Fork 0
mirror of https://github.com/ScoopInstaller/Main.git synced 2025-12-16 12:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(chore): Fix git conflicts with line endings (#3693)

Browse Source 
* Update .editorconfig

* Update .gitattributes
This commit is contained in:
Rashil Gandhi 2022-06-21 12:43:35 +05:30 committed by GitHub
parent c34e34c743
commit df10303a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -12,10 +12,6 @@ indent_style = space
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.{[Bb][Aa][Tt],[Cc][Mm][Dd]}]
# DOS/Win *requires* BAT/CMD files to have CRLF newlines
end_of_line = crlf
[[Mm]akefile{,.*}] [[Mm]akefile{,.*}]
# TAB-style indentation # TAB-style indentation
indent_style = tab indent_style = tab

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