X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=5e16da97408b119188687c09d5dd811b45d30b7d;hb=660689f017615c233020793967822c31975e5aa0;hp=f3e9e53122bb0173cf5368aa547d080d1005276a;hpb=5ea2262889dc3886579289b0d7205632bfea4bf2;p=poolifier.git diff --git a/.gitignore b/.gitignore index f3e9e531..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 @@ -36,16 +51,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/