From ea80453e0ccec338795d718216308c47431123d6 Mon Sep 17 00:00:00 2001 From: Wulfspider Date: Thu, 8 Aug 2013 08:26:01 -0400 Subject: [PATCH] Add gitattributes for line ending normalization. Add additional exclusions to gitignore. --- .gitattributes | 11 ++++++--- .gitignore | 65 +++++++++++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 28 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1c80ba6..5e90407 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/.gitignore b/.gitignore index 3d89a3a..2e4ff99 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ -# Compiled source # -################### +# Build # +######### +MANIFEST.MF +dependency-reduced-pom.xml + +# Compiled # +############ bin +build +dist lib out target @@ -11,9 +18,11 @@ target *.o *.so -# Git # -####### -.git +# Databases # +############# +*.db +*.sql +*.sqlite # Packages # ############ @@ -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 @@ -61,7 +69,14 @@ nb-configuration.xml *.ipr *.iws -# Misc files # -############## -*.bak -config.yml +# Runtime # +########### +/cache +/config +/data +/natives +/plugins +/resources +/update +/updates +/worlds