Minor changes to git config files

This commit is contained in:
Spanti Nicola (RyDroid) 2015-07-21 00:23:50 +02:00
parent 9fcd3a2769
commit 84f58e2065
2 changed files with 36 additions and 8 deletions

10
.gitattributes vendored
View file

@ -10,13 +10,13 @@
*.dbproj merge=union
# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.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
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

34
.gitignore vendored
View file

@ -165,6 +165,23 @@ UpgradeLog*.htm
App_Data/*.mdf
App_Data/*.ldf
#############
## Qt Creator
#############
*.save
*.autosave
#############
## GNU Emacs
#############
\#*
.\#*
*.elc
#############
## Windows detritus
#############
@ -179,10 +196,21 @@ Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Mac crap
#############
## OS X
#############
.DS_Store
#############
## C#
#############
*.resources
#############
## Python
#############
@ -208,8 +236,8 @@ pip-log.txt
.coverage
.tox
#Translations
# Translations
*.mo
#Mr Developer
# Mr Developer
.mr.developer.cfg