From 17bd522ff7e64cd06e8c143b0a532472aacf9968 Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Tue, 12 Jul 2022 11:35:20 -0600 Subject: [PATCH] chore(git): update git control files --- .gitattributes | 48 ++++++++++++++++++++++++++++++++++++------------ .gitignore | 35 ++++++++++++++++++++++++++--------- 2 files changed, 62 insertions(+), 21 deletions(-) diff --git a/.gitattributes b/.gitattributes index cd415fa..c6aa9df 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,17 +10,17 @@ # Documents *.bibtex text diff=bibtex -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain -*.md text +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +*.md text diff=markdown *.tex text diff=tex *.adoc text *.textile text @@ -30,6 +30,7 @@ *.tsv text *.txt text *.sql text +*.ps1 text eol=crlf # Graphics *.png binary @@ -48,11 +49,28 @@ # Scripts *.bash text eol=lf +*.fish text eol=lf *.sh text eol=lf # These are explicitly windows files and should use crlf *.bat text eol=crlf *.cmd text eol=crlf -*.ps1 text eol=crlf + +# web frontend stack -- force LF so SRI hashes are always correct +*.html text eol=lf +*.htm text eol=lf +*.css text eol=lf +*.min.css text eol=lf +*.js text eol=lf +*.min.js text eol=lf +*.php text eol=lf + +# Visual Studio projects (Rider also) +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union # Serialisation *.json text @@ -65,12 +83,18 @@ *.7z binary *.gz binary *.tar binary +*.tgz binary *.zip binary +# Text files where line endings should be preserved +*.patch -text + # # Exclude files from exporting # .gitattributes export-ignore .gitignore export-ignore +.gitkeep export-ignore +.idea export-ignore .vscode export-ignore diff --git a/.gitignore b/.gitignore index 380ca44..a860718 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,27 @@ -# ignore all vscode config files -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -!.vscode/numbered-bookmarks.json +# +# JetBrains exclusions +# -# ignore all generated logfiles -*.log +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# modules +.idea_modules/ + +# Editor-based Rest Client +.idea/httpRequests