diff --git a/.gitattributes b/.gitattributes index 7cdadf9..a997bc2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,9 @@ +# Git config here +* text eol=lf + +############################################# +# Git lfs stuff + # Documents *.pdf filter=lfs diff=lfs merge=lfs -text *.doc filter=lfs diff=lfs merge=lfs -text @@ -19,6 +25,7 @@ # Images *.png filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text +*.jpeg filter=lfs diff=lfs merge=lfs -text *.gif filter=lfs diff=lfs merge=lfs -text # Fonts @@ -51,4 +58,7 @@ # QT -*.ui filter=lfs diff=lfs merge=lfs -text \ No newline at end of file +*.ui filter=lfs diff=lfs merge=lfs -text +*.exe filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text +*.qm filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index eccad86..d431210 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # IDE folder /.idea +/.vscode # Microsoft office Lockfiles ~$*