mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
b4ee9d33e5
Problem: Editorconfig was configured to strip trailing whitespace in all file types. This is generally a good thing, but when interactive rebasing with Git and editing the contents of a commit, trailing whitespace is significant on blank lines and must be preserved in order for edits to be applied cleanly. Solution: Update Editorconfig to exclude *.diff from the strip whitespace rule, as interactive rebasing edits are done in a temporary file with a '.diff' suffix.
27 lines
394 B
INI
27 lines
394 B
INI
root = true
|
|
|
|
[*]
|
|
indent_style = space
|
|
indent_size = 4
|
|
continuation_indent_size = 8
|
|
end_of_line = lf
|
|
charset = utf-8
|
|
trim_trailing_whitespace = true
|
|
insert_final_newline = true
|
|
|
|
[*.diff]
|
|
trim_trailing_whitespace = false
|
|
|
|
[Makefile]
|
|
indent_style = tab
|
|
|
|
[*.bat]
|
|
end_of_line = crlf
|
|
|
|
[build.gradle]
|
|
continuation_indent_size = 4
|
|
|
|
[.idea/codeStyles/*.xml]
|
|
indent_size = 2
|
|
insert_final_newline = false
|