X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=5e16da97408b119188687c09d5dd811b45d30b7d;hb=410724041bab556be1385c56f9a32e5030f6f2cf;hp=8ddca4bea480b8dfb25dcd55fc9a35cce5820184;hpb=e99dbb6932ed5548a9bdf3497a00539a143a23a7;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 8ddca4be..5e16da97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,18 @@
+### Git ###
+# Created by git for backups. To disable backups in 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
+
 # Logs
 logs
 *.log
@@ -52,8 +67,15 @@ build/config.gypi
 # Mac
 .DS_Store
 
+# pnpm
+package-lock.json
+
 # Project specifics
 .eslintcache
 .history/
 .scannerwork
+*.bak
 lib
+dist
+tmp
+reports/