Skip to content

Commit 3829c77

Browse files
authored
Merge branch 'main' into add-helm-volumes-values
2 parents acfecfa + 0e89db0 commit 3829c77

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ indent_size = 2
2020
[Makefile*]
2121
indent_style = tab
2222

23+
[*.bat]
24+
end_of_line = crlf
25+
2326
[src/main/resources/default_banner.txt]
2427
insert_final_newline = false

.gitattributes

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
src/generated/** linguist-generated
1+
# Line endings: store LF in the repository and check out LF on every platform.
2+
# Git detects binary files itself through text=auto. The entries below are the exceptions.
3+
* text=auto eol=lf
4+
5+
# Windows batch files need CRLF in the working tree.
6+
*.bat text eol=crlf
7+
8+
# Binary files
9+
*.jar binary
10+
*.png binary
11+
12+
# GitHub: mark the jOOQ generated sources as generated (collapsed in diffs, excluded from language statistics).
13+
generated/src/** linguist-generated

0 commit comments

Comments
 (0)