Skip to content

Commit

Permalink
Add gitattributes for line ending normalization.
Browse files Browse the repository at this point in the history
Add additional exclusions to gitignore.
  • Loading branch information
Wulfspider committed Aug 8, 2013
1 parent 487a2ee commit ea80453
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 28 deletions.
11 changes: 8 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# LF ling endings on repository and locally
* text eol=lf
*.java text eol=lf
# Normalize as LF in the repository, OS native locally
* text=auto
*.java text

# Binary files that should not be modified
*.dat binary
*.db binary
*.icns binary
*.ico binary
*.key binary
*.jks binary
*.jpg binary
*.png binary
*.ttf binary
*.wav binary
JavaApplicationStub binary
65 changes: 40 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Compiled source #
###################
# Build #
#########
MANIFEST.MF
dependency-reduced-pom.xml

# Compiled #
############
bin
build
dist
lib
out
target
Expand All @@ -11,9 +18,11 @@ target
*.o
*.so

# Git #
#######
.git
# Databases #
#############
*.db
*.sql
*.sqlite

# Packages #
############
Expand All @@ -26,33 +35,32 @@ target
*.tar
*.zip

# Logs and databases #
######################
# Repository #
##############
.git

# Logging #
###########
/logs
*.log
*.sql
*.sqlite

# OS generated files #
######################
# Misc #
########
*.bak

# System #
##########
.DS_Store
ehthumbs.db
Icon?
Thumbs.db

# Build files #
#################
MANIFEST.MF
dependency-reduced-pom.xml

# Project files #
#################
# Project #
###########
.classpath
.externalToolBuilders
.idea
.project
.settings
build
dist
nbproject
atlassian-ide-plugin.xml
build.xml
Expand All @@ -61,7 +69,14 @@ nb-configuration.xml
*.ipr
*.iws

# Misc files #
##############
*.bak
config.yml
# Runtime #
###########
/cache
/config
/data
/natives
/plugins
/resources
/update
/updates
/worlds

0 comments on commit ea80453

Please sign in to comment.