diff --git a/.gitattributes b/.gitattributes index 78b0fe0..2a2187b 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 eol=lf +*.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 @@ -53,7 +54,22 @@ # 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 + +# 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 @@ -66,19 +82,18 @@ *.7z binary *.gz binary *.tar binary +*.tgz binary *.zip binary -# nginx files -*.conf text eol=lf +# Text files where line endings should be preserved +*.patch -text # # Exclude files from exporting -# only export helper scripts # -.gitattributes export-ignore -.gitignore export-ignore -.vscode export-ignore -.idea export-ignore -build export-ignore -README.md export-ignore +.gitattributes export-ignore +.gitignore export-ignore +.gitkeep export-ignore +.idea export-ignore +.vscode export-ignore diff --git a/.gitignore b/.gitignore index bb0e4f7..00b9035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,75 @@ -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -!.vscode/numbered-bookmarks.json -*.code-workspace +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.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 + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser # don't track my testing params file ab-nginx.params diff --git a/.idea/.idea.ab-nginx.dir/.idea/indexLayout.xml b/.idea/.idea.ab-nginx.dir/.idea/indexLayout.xml index 27ba142..7b08163 100644 --- a/.idea/.idea.ab-nginx.dir/.idea/indexLayout.xml +++ b/.idea/.idea.ab-nginx.dir/.idea/indexLayout.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/.idea.ab-nginx.dir/.idea/riderModule.iml b/.idea/.idea.ab-nginx.dir/.idea/riderModule.iml deleted file mode 100644 index 1a4e0d9..0000000 --- a/.idea/.idea.ab-nginx.dir/.idea/riderModule.iml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file