Skip to content

Commit f1f705d

Browse files
authored
Merge pull request #4 from GCuser99/main
Add linguist-language attribute for twinBASIC
2 parents 7ab489d + 757df61 commit f1f705d

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

gitattributes/CRLF everywhere/.gitattributes

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@
3232
*.[dD][oO][xX] binary
3333
*.[pP][gG][xX] binary
3434

35-
# twinBASIC extensions - Prevent LF normalization (twin, tbform)
36-
*.[tT][wW][iI][nN] -text diff
37-
*.[tT][bB][fF][oO][rR][mM] -text diff
35+
# twinBASIC sources extensions - Prevent LF normalization (twin, tbform)
36+
*.[tT][wW][iI][nN] -text diff linguist-language=VB6
37+
*.[tT][bB][fF][oO][rR][mM] -text diff linguist-language=JSON
3838

39-
# twinBASIC extensions - Mark as binary
39+
# twinBASIC project extension - Mark as binary (twinproj)
4040
*.[tT][wW][iI][nN][pP][rR][oO][jJ] binary
4141

4242
############################################################################
4343
# Other Windows-specific extensions
4444
############################################################################
4545

46-
# INI file extensions - Prevent LF normalization
46+
# INI file extensions - Prevent LF normalization (ini)
4747
*.[iI][nN][iI] -text diff
4848

49-
# Batch scripts - Prevent LF normalization
49+
# Batch scripts - Prevent LF normalization (cmd, bat)
5050
*.[cC][mM][dD] -text diff
5151
*.[bB][aA][tT] -text diff
5252

@@ -74,22 +74,22 @@
7474
# Access documents (accdb)
7575
*.[aA][cC][cC][dD][bB] binary
7676

77-
# Images
77+
# Images (jpg, png, bmp, gif, ico)
7878
*.[jJ][pP][gG] binary
7979
*.[pP][nN][gG] binary
8080
*.[bB][mM][pP] binary
8181
*.[gG][iI][fF] binary
8282
*.[iI][cC][oO] binary
8383

84-
# Compressed files
84+
# Compressed files (zip, cab, 7z, gz)
8585
*.[zZ][iI][pP] binary
8686
*.[cC][aA][bB] binary
8787
*.[7][zZ] binary
8888
*.[gG][zZ] binary
8989

90-
# Executables
90+
# Executables (exe, dll)
9191
*.[eE][xX][eE] binary
9292
*.[dD][lL][lL] binary
9393

94-
# Other
94+
# Other (pdf)
9595
*.[pP][dD][fF] diff=astextplain

gitattributes/CRLF in Working Directory only/.gitattributes

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@
3333
*.[dD][oO][xX] binary
3434
*.[pP][gG][xX] binary
3535

36-
# twinBASIC extensions - Prevent LF normalization (twin, tbform)
37-
*.[tT][wW][iI][nN] text eol=crlf
38-
*.[tT][bB][fF][oO][rR][mM] text eol=crlf
36+
# twinBASIC sources extensions - Prevent LF normalization (twin, tbform)
37+
*.[tT][wW][iI][nN] text eol=crlf linguist-language=VB6
38+
*.[tT][bB][fF][oO][rR][mM] text eol=crlf linguist-language=JSON
3939

40-
# twinBASIC extensions - Mark as binary
40+
# twinBASIC project extension - Mark as binary (twinproj)
4141
*.[tT][wW][iI][nN][pP][rR][oO][jJ] binary
4242

4343
############################################################################
4444
# Other Windows-specific extensions
4545
############################################################################
4646

47-
# INI file extensions - Prevent LF normalization
47+
# INI file extensions - Prevent LF normalization (ini)
4848
*.[iI][nN][iI] text eol=crlf
4949

50-
# Batch scripts - Prevent LF normalization
50+
# Batch scripts - Prevent LF normalization (cmd, bat)
5151
*.[cC][mM][dD] text eol=crlf
5252
*.[bB][aA][tT] text eol=crlf
5353

@@ -75,22 +75,22 @@
7575
# Access documents (accdb)
7676
*.[aA][cC][cC][dD][bB] binary
7777

78-
# Images
78+
# Images (jpg, png, bmp, gif, ico)
7979
*.[jJ][pP][gG] binary
8080
*.[pP][nN][gG] binary
8181
*.[bB][mM][pP] binary
8282
*.[gG][iI][fF] binary
8383
*.[iI][cC][oO] binary
8484

85-
# Compressed files
85+
# Compressed files (zip, cab, 7z, gz)
8686
*.[zZ][iI][pP] binary
8787
*.[cC][aA][bB] binary
8888
*.[7][zZ] binary
8989
*.[gG][zZ] binary
9090

91-
# Executables
91+
# Executables (exe, dll)
9292
*.[eE][xX][eE] binary
9393
*.[dD][lL][lL] binary
9494

95-
# Other
95+
# Other (pdf)
9696
*.[pP][dD][fF] diff=astextplain

gitattributes/Force CRLF everywhere with filters/.gitattributes

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
# (The reason why we need the ".." is to move one folder up because the config file is located in the .git subfolder.)
1010
# - Then make sure that you have a file named .gitconfig in your Git repository like this file: https://github.com/DecimalTurn/VBA-on-GitHub/blob/main/gitattributes/Force%20CRLF%20everywhere%20with%20filters/.gitconfig
1111

12-
# VBA extensions - Enforce CRLF using a filter
12+
# VBA extensions - Enforce CRLF using a filter (bas, cls, frm, vba)
1313
*.[bB][aA][sS] filter=crlf -text diff
1414
*.[cC][lL][sS] filter=crlf -text diff
1515
*.[fF][rR][mM] filter=crlf -text diff
1616
*.[vV][bB][aA] filter=crlf -text diff
1717

18-
# VBA extensions - Mark as binary
18+
# VBA extensions - Mark as binary (frx)
1919
*.[fF][rR][xX] binary
2020
############################################################################
2121
# Other languages in the VB family
@@ -40,21 +40,21 @@
4040
*.[dD][oO][xX] binary
4141
*.[pP][gG][xX] binary
4242

43-
# twinBASIC extensions - Prevent LF normalization (twin, tbform)
44-
*.[tT][wW][iI][nN] filter=crlf -text diff
45-
*.[tT][bB][fF][oO][rR][mM] filter=crlf -text diff
43+
# twinBASIC sources extensions - Prevent LF normalization (twin, tbform)
44+
*.[tT][wW][iI][nN] filter=crlf -text diff linguist-language=VB6
45+
*.[tT][bB][fF][oO][rR][mM] filter=crlf -text diff linguist-language=JSON
4646

47-
# twinBASIC extensions - Mark as binary
47+
# twinBASIC project extension - Mark as binary (twinproj)
4848
*.[tT][wW][iI][nN][pP][rR][oO][jJ] binary
4949

5050
############################################################################
5151
# Other Windows-specific extensions
5252
############################################################################
5353

54-
# INI file extensions - Prevent LF normalization
54+
# INI file extensions - Prevent LF normalization (ini)
5555
*.[iI][nN][iI] filter=crlf -text diff
5656

57-
# Batch scripts - Prevent LF normalization
57+
# Batch scripts - Prevent LF normalization (cmd, bat)
5858
*.[cC][mM][dD] filter=crlf -text diff
5959
*.[bB][aA][tT] filter=crlf -text diff
6060

@@ -82,22 +82,22 @@
8282
# Access documents (accdb)
8383
*.[aA][cC][cC][dD][bB] binary
8484

85-
# Images
85+
# Images (jpg, png, bmp, gif, ico)
8686
*.[jJ][pP][gG] binary
8787
*.[pP][nN][gG] binary
8888
*.[bB][mM][pP] binary
8989
*.[gG][iI][fF] binary
9090
*.[iI][cC][oO] binary
9191

92-
# Compressed files
92+
# Compressed files (zip, cab, 7z, gz)
9393
*.[zZ][iI][pP] binary
9494
*.[cC][aA][bB] binary
9595
*.[7][zZ] binary
9696
*.[gG][zZ] binary
9797

98-
# Executables
98+
# Executables (exe, dll)
9999
*.[eE][xX][eE] binary
100100
*.[dD][lL][lL] binary
101101

102-
# Other
102+
# Other (pdf)
103103
*.[pP][dD][fF] diff=astextplain

0 commit comments

Comments
 (0)