1 files changed, 23 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ac2ac55..20d10d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,21 @@
+### Git ###
+
+# Created by git for backups. To disable backups in Git:
+.git/
+
+# $ git config --global mergetool.keepBackup false
+*.orig
+
+# Created by git when using merge tools for conflicts
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
+
 ### Linux ###
 
 *~
@@ -176,3 +194,8 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+
+### Project ###
+
+# Resulting code
+/*.js