Skip to content

Commit 74d905f

Browse files
committed
Add a .gitattributes file
Hopefully this will reduce merge problems when people on Windows machines edit text files. (Seems to happen with strings.xml files.) Enable java-specific diff comments.
1 parent c145ded commit 74d905f

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

.gitattributes

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Normalize line endings for text files.
2+
# This only affects how files are stored within the repo. Git will
3+
# automatically convert line endings to the platform choice when checking out,
4+
# and automatically convert them back to the normal form when checking in.
5+
6+
* text=auto
7+
8+
# Ensure XML files are treated a text files.
9+
10+
*.xml text
11+
12+
# Use java diff syntax for java files.
13+
14+
*.java diff=java

0 commit comments

Comments
 (0)