From 4a16bc4bc49b8b670cd38e8bdcaea87fab5b53aa Mon Sep 17 00:00:00 2001 From: Florian Heilmann Date: Thu, 21 Dec 2023 14:46:51 +0100 Subject: [PATCH] Remove .vscode folder, update .gitignore [skip ci] --- .gitignore | 118 ++++++++++++++++++++++++++++++++++++++++-- .vscode/settings.json | 5 -- 2 files changed, 115 insertions(+), 8 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index d621710a72..d05a0edbbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,116 @@ -.DS_Store -.DS_store +# Created by https://www.toptal.com/developers/gitignore/api/macos,visualstudiocode,windows,linux,git,tortoisegit +# Edit at https://www.toptal.com/developers/gitignore?templates=macos,visualstudiocode,windows,linux,git,tortoisegit + +### 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 + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_[Ss]tore +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### macOS Patch ### +# iCloud generated files +*.icloud + +### TortoiseGit ### +# Project-level settings +/.tgitconfig + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files .history -.vscode +.ionide + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.toptal.com/developers/gitignore/api/macos,visualstudiocode,windows,linux,git,tortoisegit diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 058954976e..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "githubPullRequests.ignoredPullRequestBranches": [ - "master" - ] -} \ No newline at end of file