Correcting errors when doing push / pull

This commit is contained in:
Pagani Walter
2021-10-16 17:14:30 -03:00
parent 53611df5fb
commit cc9a133ec2

209
.gitattributes vendored
View File

@@ -1,105 +1,104 @@
## AUTO-DETECT ## AUTO-DETECT
## Handle line endings automatically for files detected as ## Handle line endings automatically for files detected as
## text and leave all files detected as binary untouched. ## text and leave all files detected as binary untouched.
## This will handle all files NOT defined below. ## This will handle all files NOT defined below.
* text = auto eol = lf * text eol=lf
# Text # Text
* .conf text *.conf text
* .conf.dist text *.conf.dist text
* .cmake text *.cmake text
## Scripts ## Scripts
* .sh text *.sh text
* .fish text *.fish text
* .lua text *.lua text
## SQL ## SQL
* .sql text *.sql text
## C++ ## C++
* .c text *.c text
* .cc text *.cc text
* .cxx text *.cxx text
* .cpp text *.cpp text
* .c++ text *.c++ text
* .hpp text *.hpp text
* .h text *.h text
* .h++ text *.h++ text
* .hh text *.hh text
## For documentation
## For documentation
# Documents
# Documents *.doc diff=astextplain
* .doc diff = astextplain *.DOC diff=astextplain
* .DOC diff = astextplain *.docx diff=astextplain
* .docx diff = astextplain *.DOCX diff=astextplain
* .DOCX diff = astextplain *.dot diff=astextplain
* .dot diff = astextplain *.DOT diff=astextplain
* .DOT diff = astextplain *.pdf diff=astextplain
* .pdf diff = astextplain *.PDF diff=astextplain
* .PDF diff = astextplain *.rtf diff=astextplain
* .rtf diff = astextplain *.RTF diff=astextplain
* .RTF diff = astextplain
## DOCUMENTATION
## DOCUMENTATION *.markdown text
* .markdown text *.md text
* .md text *.mdwn text
* .mdwn text *.mdown text
* .mdown text *.mkd text
* .mkd text *.mkdn text
* .mkdn text *.mdtxt text
* .mdtxt text *.mdtext text
* .mdtext text *.txt text
* .txt text AUTHORS text
AUTHORS text CHANGELOG text
CHANGELOG text CHANGES text
CHANGES text CONTRIBUTING text
CONTRIBUTING text COPYING text
COPYING text copyright text
copyright text COPYRIGHT text
* COPYRIGHT * text INSTALL text
INSTALL text license text
license text LICENSE text
LICENSE text NEWS text
NEWS text readme text
readme text README text
* README * text TODO text
TODO text
## GRAPHICS
## GRAPHICS *.ai binary
* .ai binary *.bmp binary
* .bmp binary *.eps binary
* .eps binary *.gif binary
* .gif binary *.ico binary
* .ico binary *.jng binary
* .jng binary *.jp2 binary
* .jp2 binary *.jpg binary
* .jpg binary *.jpeg binary
* .jpeg binary *.jpx binary
* .jpx binary *.jxr binary
* .jxr binary *.pdf binary
* .pdf binary *.png binary
* .png binary *.psb binary
* .psb binary *.psd binary
* .psd binary *.svg text
* .svg text *.svgz binary
* .svgz binary *.tif binary
* .tif binary *.tiff binary
* .tiff binary *.wbmp binary
* .wbmp binary *.webp binary
* .webp binary
## ARCHIVES
## ARCHIVES *.7z binary
* .7z binary *.gz binary
* .gz binary *.jar binary
* .jar binary *.rar binary
* .rar binary *.tar binary
* .tar binary *.zip binary
* .zip binary
## EXECUTABLES
## EXECUTABLES *.exe binary
* .exe binary *.pyc binary
* .pyc binary