dox4/Java
1
0
Fork 0
mirror of https://github.com/ScoopInstaller/Java.git synced 2026-08-03 09:39:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

(chore): Fix git conflicts with line endings

Browse Source 
related: https://github.com/ScoopInstaller/Extras/issues/7546
related: https://github.com/ScoopInstaller/Extras/pull/8285
This commit is contained in:
unknown 2022-06-30 23:00:55 +08:00
parent 732fcbdc9d
commit 60741e030f
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
trim_trailing_whitespace = true
[*.{bat,cmd,[Bb][Aa][Tt],[Cc][Mm][Dd]]
# DOS/Win *requires* BAT/CMD files to have CRLF newlines
end_of_line = crlf
[[Mm]akefile{,.*}]
# TAB-style indentation
indent_style = tab

6
.gitattributes vendored
View File

@ -1,2 +1,4 @@
# retain windows line-endings in case checked out on mac or linux
* text eol=crlf
# Since Scoop is a Windows-only tool, we can safely use CRLF line endings for all text files.
# 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