mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 01:41:11 +01:00
Do not strip trailing whitespace in Git diffs
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.
This commit is contained in:
parent
d6a6b9535c
commit
b4ee9d33e5
@ -9,6 +9,9 @@ charset = utf-8
|
|||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
|
|
||||||
|
[*.diff]
|
||||||
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
[Makefile]
|
[Makefile]
|
||||||
indent_style = tab
|
indent_style = tab
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user