X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=9fbcf6a7e54e7a4e6c5ceb9295e1c4f5126830a5;hb=9d96ba4ea0e2e4b06216657cb1641551b59f58ee;hp=f3e9e53122bb0173cf5368aa547d080d1005276a;hpb=5ea2262889dc3886579289b0d7205632bfea4bf2;p=poolifier.git diff --git a/.gitignore b/.gitignore index f3e9e531..9fbcf6a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,17 @@ +# 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 @@ -36,16 +50,31 @@ jspm_packages # Optional REPL history .node_repl_history -# Project specifics +# VisualStudioCode .vscode/* !.vscode/extensions.json !.vscode/launch.json !.vscode/settings.json !.vscode/tasks.json +# Intellij +/.idea +/outputs +/docker/mongo +build/config.gypi + # Mac .DS_Store +# pnpm +package-lock.json + +# Project specifics +.eslintcache .history/ .scannerwork +*.bak lib +dist +tmp +reports/