fred/wallet
1
0
Fork 0
forked from cheng/wallet
Code Pull Requests Activity

still fighting the evil of lfs, which inserts its tentacles everywher

Browse Source
This commit is contained in:
Cheng 2022-06-15 18:11:58 +10:00
parent 025407091c
commit 5364b3f770
No known key found for this signature in database
GPG Key ID: D51301E176B31828
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
.gitattributes vendored
View File

@ -38,32 +38,37 @@ Makefile text eol=lf encoding=utf-8
# Force binary files to be binary # Force binary files to be binary
# Archives ###############################################################################
*.7z filter=lfs diff=lfs merge=lfs -text # Set default behavior for command prompt diff.
*.br filter=lfs diff=lfs merge=lfs -text #
*.gz filter=lfs diff=lfs merge=lfs -text # This is need for earlier builds of msysgit that does not have it on by
*.tar filter=lfs diff=lfs merge=lfs -text # default for csharp files.
*.zip filter=lfs diff=lfs merge=lfs -text # Note: This is only used by command line
###############################################################################
# Documents #*.cs diff=csharp
*.pdf filter=lfs diff=lfs merge=lfs -text
# Images
*.gif filter=lfs diff=lfs merge=lfs -text
*.ico filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.psd filter=lfs diff=lfs merge=lfs -text
*.webp filter=lfs diff=lfs merge=lfs -text
# Fonts
*.woff2 filter=lfs diff=lfs merge=lfs -text
# Other
*.exe filter=lfs diff=lfs merge=lfs -text
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
############################################################################### ###############################################################################
# diff behavior for common document formats # diff behavior for common document formats
# #