Merge pull request #687 from syntaqx/git-files

added gitattributes file and updated gitignore

Merge pull request #687 from syntaqx/git-files
added gitattributes file and updated gitignore
d29c5bfd · Taylor Otwell · 5adc2256 · 948ce87c · d29c5bfd · d29c5bfd
Commit d29c5bfd authored May 21, 2012 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 37 additions and 0 deletions

.gitattributes .gitattributes +1 -0

.gitignore .gitignore +36 -0

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+* text=auto
\ No newline at end of file
--- a/.gitignore
+++ b/.gitignore
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+# OS or Editor folders
 .DS_Store
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+# Dreamweaver added files
+_notes
+dwsync.xml
+# Komodo
+*.komodoproject
+.komodotools
+# Folders to ignore
+.hg
+.svn
+.CVS
+intermediate
+publish
+.idea
\ No newline at end of file