Skip to content

Commit

Permalink
Update base files
Browse files Browse the repository at this point in the history
  • Loading branch information
skrysmanski committed Mar 4, 2024
1 parent 741d73b commit 143d01b
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ root = true
# All files
#
[*]
# For reasoning about encoding, see: https://github.com/skrysmanski/base/blob/master/docs/utf8-and-bom.md
# For reasoning about encoding, see: https://manski.net/articles/utf8-bom
charset = utf-8

end_of_line = lf
Expand All @@ -34,7 +34,7 @@ insert_final_newline = true
[*.md]
charset = utf-8-bom

# For explanation why spaces are used for Markdown, see: https://github.com/skrysmanski/base/blob/master/docs/markdown-indentation.md
# For explanation why spaces are used for Markdown, see: https://manski.net/articles/markdown/indentation
indent_style = space
indent_size = 4

Expand Down Expand Up @@ -72,7 +72,7 @@ end_of_line = crlf
# and maybe even strings to show to the user).
charset = utf-8-bom

# For explanation why "crlf", see: https://github.com/skrysmanski/base-dotnet/blob/main/docs/cs-line-endings.md
# For explanation why "crlf", see: https://manski.net/articles/dotnet/line-endings
# NOTE: This is also enforced through .gitattributes.
end_of_line = crlf

Expand Down
48 changes: 36 additions & 12 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
##############################################################################
#
# Defines Git attributes (text, binary, lfs, ...) for various file extensions.
#
# Official documentation: https://git-scm.com/docs/gitattributes
#
# File pattern format: https://git-scm.com/docs/gitignore#_pattern_format
#
##############################################################################
#
# NOTE: To re-apply all changes in this file to the current repository, run:
#
Expand All @@ -13,21 +22,13 @@
#
# git status -v
#
##############################################################################

# Prevent git from messing around with line endings (i.e. treat all files as binary by default).
* -text

# ReSharper has (historically and up until the time of writing) being bad with
# respecting line endings when generating code (often resulting in mixed line
# endings). Unfortunately, the ReSharper devs don't seem to care too much about
# this. So, with this we at least enforce consistent line endings when files are
# committed to Git.
#
# For explanation why "crlf", see: https://github.com/skrysmanski/base-dotnet/blob/main/docs/cs-line-endings.md
#
# See also:
# * https://youtrack.jetbrains.com/issue/RSRP-478837
# * https://youtrack.jetbrains.com/issue/RSRP-494722
# Enforce CRLF line endings for C# files. Prevents accidental commits with mixed line endings.
# For details on this and an explanation why "crlf", see: https://manski.net/articles/dotnet/line-endings
*.cs text eol=crlf

# NOTE: Visual Studio does not respect the end-of-line settings in
Expand All @@ -36,10 +37,15 @@
# (Windows or Linx/Unix/macOS). See .editorconfig for more details.
*.csproj text=auto

# Store binary files in git-lfs
#
# Binary files - stored in git-lfs
#

## Application files
**/*.exe filter=lfs diff=lfs merge=lfs
**/*.dll filter=lfs diff=lfs merge=lfs

## Image files
**/*.gif filter=lfs diff=lfs merge=lfs
**/*.png filter=lfs diff=lfs merge=lfs
**/*.jpg filter=lfs diff=lfs merge=lfs
Expand All @@ -49,19 +55,27 @@
**/*.ico filter=lfs diff=lfs merge=lfs
**/*.cur filter=lfs diff=lfs merge=lfs

## Movie files
**/*.avi filter=lfs diff=lfs merge=lfs
**/*.mpg filter=lfs diff=lfs merge=lfs
**/*.mpeg filter=lfs diff=lfs merge=lfs

## Audio files
**/*.wav filter=lfs diff=lfs merge=lfs
**/*.mp3 filter=lfs diff=lfs merge=lfs
**/*.m4a filter=lfs diff=lfs merge=lfs

## Archive files
**/*.zip filter=lfs diff=lfs merge=lfs
**/*.gz filter=lfs diff=lfs merge=lfs

## Font files
**/*.ttf filter=lfs diff=lfs merge=lfs
**/*.otf filter=lfs diff=lfs merge=lfs
**/*.woff filter=lfs diff=lfs merge=lfs
**/*.woff2 filter=lfs diff=lfs merge=lfs

## Office documents
**/*.doc filter=lfs diff=lfs merge=lfs
**/*.docx filter=lfs diff=lfs merge=lfs
**/*.xls filter=lfs diff=lfs merge=lfs
Expand All @@ -72,4 +86,14 @@
**/*.xps filter=lfs diff=lfs merge=lfs
**/*.rtf filter=lfs diff=lfs merge=lfs

## Other binary files
**/*.bin filter=lfs diff=lfs merge=lfs

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# Exclude files from GitHub's language statistics
# https://github.com/github-linguist/linguist/blob/master/docs/overrides.md#vendored-code

# Helper scripts present in most repositories
/git-clean.* linguist-vendored
/git-clone-submodules.* linguist-vendored
15 changes: 11 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
##############################################################################
#
# This file list paths that are ignored by git.
# This file defines paths/files that are ignored by Git.
#
# Tutorial: https://www.atlassian.com/git/tutorials/saving-changes/gitignore
# Tutorial: https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#_ignoring
#
# GitIgnore files for various project types: https://github.com/github/gitignore
# File pattern format: https://git-scm.com/docs/gitignore#_pattern_format
#

# Useful .gitignore templates: https://github.com/github/gitignore
#
# Official documentation: https://git-scm.com/docs/gitignore
#
##############################################################################

#
# Common ignores
Expand All @@ -20,6 +25,8 @@
.DS_Store


# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

#
# Visual Studio ignores
#
Expand Down
2 changes: 1 addition & 1 deletion _ProjectCommons

0 comments on commit 143d01b

Please sign in to comment.