Merge pull request #1 from rxin/gitignore

Updated .gitignore to include IntelliJ files.
marmbrus · Jan 3, 2014 · e58304a · e58304a
2 parents 0079392 + 019ea74
commit e58304a
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,19 @@
-.DS_Store
+
+# Scala compilation
 target/
+
+# IntelliJ files
+*.iml
 .idea/
+.idea_modules/
+
+# Hive files
 metastore_db/
 metastore/
 warehouse/
-TempStatsStore/
-hs_err_*.log
 derby.log
-.idea_modules/
+hs_err_*.log
+TempStatsStore/
+
+# Mac OS X
+.DS_Store