|
1 | 1 | # ------------------------------------------------------------------------------ |
2 | | -# Core: normalize text files and keep LF in the repo (Windows can still check out |
3 | | -# CRLF locally depending on user config like core.autocrlf) |
| 2 | +# Core: normalize text files and keep LF in repo |
4 | 3 | # ------------------------------------------------------------------------------ |
5 | 4 | * text=auto eol=lf |
6 | 5 |
|
7 | 6 | # ------------------------------------------------------------------------------ |
8 | | -# Text files (force LF in repo) |
| 7 | +# Source code (force LF) |
9 | 8 | # ------------------------------------------------------------------------------ |
10 | 9 | *.java text eol=lf |
11 | 10 | *.kt text eol=lf |
|
27 | 26 | *.bash text eol=lf |
28 | 27 | *.gradle text eol=lf |
29 | 28 | *.properties text eol=lf |
30 | | -*.cmd text eol=lf |
31 | | -*.bat text eol=lf |
32 | | -*.ps1 text eol=lf |
| 29 | +*.sql text eol=lf |
| 30 | +*.c text eol=lf |
| 31 | +*.cpp text eol=lf |
| 32 | +*.h text eol=lf |
33 | 33 |
|
34 | 34 | # ------------------------------------------------------------------------------ |
35 | | -# Binary files (never touch line endings or attempt merges) |
| 35 | +# Binary files (never touch line endings / no diffs) |
36 | 36 | # ------------------------------------------------------------------------------ |
37 | | -# Images & media |
38 | | -*.png binary |
39 | | -*.jpg binary |
40 | | -*.jpeg binary |
41 | | -*.gif binary |
42 | | -*.ico binary |
43 | | -*.svg binary |
44 | | -*.webp binary |
45 | | - |
46 | | -# Documents |
47 | | -*.pdf binary |
48 | | - |
49 | | -# Java / native / compiled |
50 | | -*.jar binary |
51 | | -*.war binary |
52 | | -*.class binary |
53 | | -*.dll binary |
54 | | -*.exe binary |
55 | | -*.so binary |
56 | | -*.dylib binary |
57 | | - |
58 | | -# Databases & blobs |
59 | | -*.db binary |
| 37 | +*.png binary |
| 38 | +*.jpg binary |
| 39 | +*.jpeg binary |
| 40 | +*.gif binary |
| 41 | +*.ico binary |
| 42 | +*.svg binary |
| 43 | +*.webp binary |
| 44 | +*.pdf binary |
| 45 | +*.jar binary |
| 46 | +*.war binary |
| 47 | +*.class binary |
| 48 | +*.dll binary |
| 49 | +*.exe binary |
| 50 | +*.so binary |
| 51 | +*.dylib binary |
| 52 | +*.db binary |
60 | 53 | *.sqlite binary |
61 | | - |
62 | | -# Archives & compressed |
63 | | -*.zip binary |
64 | | -*.tar binary |
| 54 | +*.zip binary |
| 55 | +*.tar binary |
65 | 56 | *.tar.gz binary |
66 | | -*.tgz binary |
67 | | -*.7z binary |
68 | | -*.gz binary |
69 | | -*.xz binary |
70 | | -*.bz2 binary |
71 | | - |
72 | | -# Animated images / misc |
73 | | -*.gif binary |
| 57 | +*.tgz binary |
| 58 | +*.7z binary |
| 59 | +*.gz binary |
| 60 | +*.xz binary |
| 61 | +*.bz2 binary |
74 | 62 |
|
75 | 63 | # ------------------------------------------------------------------------------ |
76 | 64 | # Diff & merge hygiene |
77 | 65 | # ------------------------------------------------------------------------------ |
78 | | -# Treat these as text for nicer diffs (works even without custom drivers) |
79 | | -*.md text |
80 | | -*.json text |
81 | | -*.xml text |
| 66 | +# Treat as text (better diffs) |
| 67 | +*.md text |
| 68 | +*.json text |
| 69 | +*.xml text |
| 70 | +*.yml text |
| 71 | +*.yaml text |
| 72 | +*.sql text |
82 | 73 |
|
83 | | -# Noise reducers: lockfiles rarely need diffs |
| 74 | +# Lockfiles rarely need diffs |
84 | 75 | package-lock.json -diff |
85 | 76 | yarn.lock -diff |
86 | 77 | pnpm-lock.yaml -diff |
87 | 78 | *.lock -diff |
88 | 79 |
|
89 | | -# Merging: don't attempt to merge true binaries |
90 | | -*.jar merge=binary |
91 | | -*.class merge=binary |
92 | | -*.dll merge=binary |
93 | | -*.exe merge=binary |
94 | | -*.so merge=binary |
95 | | -*.dylib merge=binary |
96 | | -*.db merge=binary |
| 80 | +# Force binary merges |
| 81 | +*.jar merge=binary |
| 82 | +*.class merge=binary |
| 83 | +*.dll merge=binary |
| 84 | +*.exe merge=binary |
| 85 | +*.so merge=binary |
| 86 | +*.dylib merge=binary |
| 87 | +*.db merge=binary |
97 | 88 | *.sqlite merge=binary |
98 | | -*.pdf merge=binary |
99 | | -*.png merge=binary |
100 | | -*.jpg merge=binary |
101 | | -*.jpeg merge=binary |
102 | | -*.gif merge=binary |
103 | | -*.ico merge=binary |
104 | | -*.svg merge=binary |
105 | | -*.webp merge=binary |
106 | | -*.zip merge=binary |
107 | | -*.tar merge=binary |
| 89 | +*.pdf merge=binary |
| 90 | +*.png merge=binary |
| 91 | +*.jpg merge=binary |
| 92 | +*.jpeg merge=binary |
| 93 | +*.gif merge=binary |
| 94 | +*.ico merge=binary |
| 95 | +*.svg merge=binary |
| 96 | +*.webp merge=binary |
| 97 | +*.zip merge=binary |
| 98 | +*.tar merge=binary |
108 | 99 | *.tar.gz merge=binary |
109 | | -*.tgz merge=binary |
110 | | -*.7z merge=binary |
111 | | -*.gz merge=binary |
112 | | -*.xz merge=binary |
113 | | -*.bz2 merge=binary |
| 100 | +*.tgz merge=binary |
| 101 | +*.7z merge=binary |
| 102 | +*.gz merge=binary |
| 103 | +*.xz merge=binary |
| 104 | +*.bz2 merge=binary |
| 105 | + |
| 106 | +# Lock files: prefer ours |
| 107 | +*.lock merge=ours |
| 108 | + |
| 109 | +# ------------------------------------------------------------------------------ |
| 110 | +# GitHub Linguist overrides (make languages visible in stats) |
| 111 | +# ------------------------------------------------------------------------------ |
| 112 | +*.yml linguist-detectable=true |
| 113 | +*.yaml linguist-detectable=true |
| 114 | +*.xml linguist-detectable=true |
| 115 | +*.json linguist-detectable=true |
| 116 | +*.md linguist-detectable=true |
| 117 | +*.sql linguist-detectable=true |
114 | 118 |
|
115 | | -# Lock files: prefer ours to avoid churn |
116 | | -*.lock merge=ours |
| 119 | +# Force correct language classification |
| 120 | +*.xml linguist-language=XML |
| 121 | +*.json linguist-language=JSON |
| 122 | +*.yml linguist-language=YAML |
| 123 | +*.yaml linguist-language=YAML |
| 124 | +*.sql linguist-language=SQL |
117 | 125 |
|
118 | 126 | # ------------------------------------------------------------------------------ |
119 | | -# Export settings (exclude dev/meta files from `git archive`) |
| 127 | +# Export settings (exclude from `git archive`) |
120 | 128 | # ------------------------------------------------------------------------------ |
121 | 129 | .gitattributes export-ignore |
122 | 130 | .gitignore export-ignore |
|
0 commit comments