1
0
Эх сурвалжийг харах

Merge pull request #1 from github/master

merge from github to my fork
chiragsanghavi 11 жил өмнө
parent
commit
e7dc9ea875
89 өөрчлөгдсөн 567 нэмэгдсэн , 230 устгасан
  1. 1 1
      Actionscript.gitignore
  2. 1 0
      Agda.gitignore
  3. 4 11
      Android.gitignore
  4. 1 0
      Autotools.gitignore
  5. 8 0
      C++.gitignore
  6. 3 0
      C.gitignore
  7. 33 2
      CONTRIBUTING.md
  8. 1 1
      CakePHP.gitignore
  9. 1 0
      CodeIgniter.gitignore
  10. 6 0
      Composer.gitignore
  11. 1 1
      Concrete5.gitignore
  12. 0 1
      Coq.gitignore
  13. 15 3
      Dart.gitignore
  14. 2 2
      Delphi.gitignore
  15. 0 4
      Django.gitignore
  16. 2 2
      Drupal.gitignore
  17. 4 0
      EPiServer.gitignore
  18. 5 1
      ExpressionEngine.gitignore
  19. 2 0
      Fancy.gitignore
  20. 0 1
      Finale.gitignore
  21. 1 1
      ForceDotCom.gitignore
  22. 0 1
      GWT.gitignore
  23. 4 0
      Global/Archives.gitignore
  24. 4 0
      Global/BricxCC.gitignore
  25. 1 1
      Global/CVS.gitignore
  26. 2 0
      Global/Cloud9.gitignore
  27. 4 2
      Global/Eclipse.gitignore
  28. 5 1
      Global/Emacs.gitignore
  29. 3 0
      Global/Ensime.gitignore
  30. 1 1
      Global/Espresso.gitignore
  31. 1 1
      Global/FlexBuilder.gitignore
  32. 0 4
      Global/IntelliJ.gitignore
  33. 23 0
      Global/JetBrains.gitignore
  34. 2 0
      Global/KDevelop4.gitignore
  35. 3 0
      Global/Kate.gitignore
  36. 0 2
      Global/Linux.gitignore
  37. 1 1
      Global/Matlab.gitignore
  38. 2 0
      Global/NotepadPP.gitignore
  39. 2 1
      Global/OSX.gitignore
  40. 0 1
      Global/PhPStorm.gitignore
  41. 0 4
      Global/PyCharm.gitignore
  42. 0 1
      Global/RubyMine.gitignore
  43. 1 1
      Global/SASS.gitignore
  44. 3 1
      Global/SBT.gitignore
  45. 5 1
      Global/SublimeText.gitignore
  46. 10 1
      Global/Tags.gitignore
  47. 1 0
      Global/Vagrant.gitignore
  48. 6 0
      Global/Windows.gitignore
  49. 2 1
      Global/vim.gitignore
  50. 0 8
      Global/webMethods.gitignore
  51. 1 0
      Go.gitignore
  52. 0 2
      Grails.gitignore
  53. 4 0
      Haskell.gitignore
  54. 4 0
      Jboss.gitignore
  55. 1 1
      Joomla.gitignore
  56. 1 1
      Kohana.gitignore
  57. 0 32
      LaTeX.gitignore
  58. 3 1
      Leiningen.gitignore
  59. 1 1
      LemonStand.gitignore
  60. 9 1
      Magento.gitignore
  61. 1 0
      Maven.gitignore
  62. 2 0
      Meteor.gitignore
  63. 1 2
      Node.gitignore
  64. 7 4
      Objective-C.gitignore
  65. 11 8
      Perl.gitignore
  66. 1 6
      PlayFramework.gitignore
  67. 0 16
      Plone.gitignore
  68. 29 0
      Prestashop.gitignore
  69. 7 0
      Processing.gitignore
  70. 27 15
      Python.gitignore
  71. 6 1
      Qt.gitignore
  72. 1 1
      R.gitignore
  73. 66 28
      README.md
  74. 14 8
      Rails.gitignore
  75. 26 15
      Ruby.gitignore
  76. 20 0
      RubyMotion.gitignore
  77. 4 1
      Scala.gitignore
  78. 0 1
      Sdcc.gitignore
  79. 1 1
      Symfony.gitignore
  80. 3 0
      Symfony2.gitignore
  81. 78 0
      TeX.gitignore
  82. 3 3
      Typo3.gitignore
  83. 5 3
      Unity.gitignore
  84. 7 0
      VVVV.gitignore
  85. 36 7
      VisualStudio.gitignore
  86. 1 2
      WordPress.gitignore
  87. 6 3
      Yii.gitignore
  88. 0 1
      ZendFramework.gitignore
  89. 3 0
      nanoc.gitignore

+ 1 - 1
Actionscript.gitignore

@@ -8,4 +8,4 @@ bin-release/
 
 
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
 # should NOT be excluded as they contain compiler settings and other important
-# information for Eclipse / Flash Builder.
+# information for Eclipse / Flash Builder.

+ 1 - 0
Agda.gitignore

@@ -0,0 +1 @@
+*.agdai

+ 4 - 11
Android.gitignore

@@ -12,19 +12,12 @@
 bin/
 bin/
 gen/
 gen/
 
 
+# Ignore gradle files
+.gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 # Local configuration file (sdk path, etc)
 local.properties
 local.properties
 
 
-# Eclipse project files
-.classpath
-.project
-
 # Proguard folder generated by Eclipse
 # Proguard folder generated by Eclipse
 proguard/
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
-

+ 1 - 0
Autotools.gitignore

@@ -11,3 +11,4 @@ Makefile.in
 /depcomp
 /depcomp
 /install-sh
 /install-sh
 /missing
 /missing
+/stamp-h1

+ 8 - 0
C++.gitignore

@@ -2,12 +2,20 @@
 *.slo
 *.slo
 *.lo
 *.lo
 *.o
 *.o
+*.obj
 
 
 # Compiled Dynamic libraries
 # Compiled Dynamic libraries
 *.so
 *.so
 *.dylib
 *.dylib
+*.dll
 
 
 # Compiled Static libraries
 # Compiled Static libraries
 *.lai
 *.lai
 *.la
 *.la
 *.a
 *.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app

+ 3 - 0
C.gitignore

@@ -1,6 +1,8 @@
 # Object files
 # Object files
 *.o
 *.o
 *.ko
 *.ko
+*.obj
+*.elf
 
 
 # Libraries
 # Libraries
 *.lib
 *.lib
@@ -16,3 +18,4 @@
 *.exe
 *.exe
 *.out
 *.out
 *.app
 *.app
+*.hex

+ 33 - 2
CONTRIBUTING.md

@@ -1,3 +1,34 @@
-Since this repo includes a large and diverse number of programming languages, frameworks, editors, and ecosystems, it's *very helpful* if you can provide a link to information supporting your pull request. Up-to-date, canonical documentation that mentions the files to be ignored is best.
+# Contributing guidelines
 
 
-This ensures we can efficiently go through pull requests and keep quality high.
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
+
+- **Provide a link to the application or project’s homepage**. Unless it’s
+  extremely popular, there’s a chance the maintainers don’t know about or use
+  the language, framework, editor, app, or project your change applies to.
+  
+- **Provide links to documentation** supporting the change you’re making.
+  Current, canonical documentation mentioning the files being ignored is best.
+  If documentation isn’t available to support your change, do the best you can
+  to explain what the files being ignored are for.
+  
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+  take a sentence or two to tell us why your change or addition should happen.
+  It’s especially helpful to articulate why this change applies to *everyone*
+  who works with the applicable technology, rather than just you or your team.
+  
+- **Please consider the scope of your change**. If your change specific to a
+  certain language or framework, then make sure the change is made to the
+  template for that language or framework, rather than to the template for an
+  editor, tool, or operating system.
+
+- **Please only modify *one template* per pull request**. This helps keep pull
+  requests and feedback focused on a specific project or technology.
+
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
+
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.

+ 1 - 1
CakePHP.gitignore

@@ -4,4 +4,4 @@ tmp/*
 app/tmp/*
 app/tmp/*
 app/[Cc]onfig/core.php
 app/[Cc]onfig/core.php
 app/[Cc]onfig/database.php
 app/[Cc]onfig/database.php
-!empty
+!empty

+ 1 - 0
CodeIgniter.gitignore

@@ -3,3 +3,4 @@
 */logs/!index.html
 */logs/!index.html
 */cache/*
 */cache/*
 */cache/!index.html
 */cache/!index.html
+*/cache/!.htaccess

+ 6 - 0
Composer.gitignore

@@ -0,0 +1,6 @@
+composer.phar
+vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock

+ 1 - 1
Concrete5.gitignore

@@ -1,3 +1,3 @@
 config/site.php
 config/site.php
 files/cache/*
 files/cache/*
-files/tmp/*
+files/tmp/*

+ 0 - 1
Coq.gitignore

@@ -1,4 +1,3 @@
 *.vo
 *.vo
 *.glob
 *.glob
 *.v.d
 *.v.d
-

+ 15 - 3
Dart.gitignore

@@ -1,4 +1,16 @@
-.DS_Store
-packages
+// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+packages/
 .project
 .project
-pubspec.lock
+.buildlog
+*.js_
+*.js.deps
+*.js.map
+
+// Include when developing application packages
+pubspec.lock 
+
+// Avoid committing generated JavaScript files
+*.dart.js
+
+// Check for any other incovenient files generated by OS 
+// and other tools such as Eclipse, IntelliJ, etc.

+ 2 - 2
Delphi.gitignore

@@ -1,5 +1,5 @@
 *.dcu
 *.dcu
-*.~*~
+*.~*
 *.local
 *.local
 *.identcache
 *.identcache
 __history
 __history
@@ -7,4 +7,4 @@ __history
 *.map
 *.map
 *.exe
 *.exe
 *.dll
 *.dll
-bin/*
+bin/*

+ 0 - 4
Django.gitignore

@@ -1,4 +0,0 @@
-*.log
-*.pot
-*.pyc
-local_settings.py

+ 2 - 2
Drupal.gitignore

@@ -8,7 +8,6 @@ sites/*/files
 sites/*/private
 sites/*/private
 
 
 # Ignore default text files
 # Ignore default text files
-.htaccess
 robots.txt
 robots.txt
 /CHANGELOG.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt
 /COPYRIGHT.txt
@@ -22,6 +21,7 @@ sites/all/modules/README.txt
 sites/all/themes/README.txt
 sites/all/themes/README.txt
 
 
 # Ignore everything but the "sites" folder ( for non core developer )
 # Ignore everything but the "sites" folder ( for non core developer )
+.htaccess
 web.config
 web.config
 authorize.php
 authorize.php
 cron.php
 cron.php
@@ -34,4 +34,4 @@ xmlrpc.php
 /modules
 /modules
 /profiles
 /profiles
 /scripts
 /scripts
-/themes
+/themes

+ 4 - 0
EPiServer.gitignore

@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config

+ 5 - 1
ExpressionEngine.gitignore

@@ -8,8 +8,12 @@ images/member_photos/
 images/signature_attachments/
 images/signature_attachments/
 images/pm_attachments/
 images/pm_attachments/
 
 
+# For security do not publish the following files
+system/expressionengine/config/database.php
+system/expressionengine/config/config.php
+
 # Caches
 # Caches
 sized/
 sized/
 thumbs/
 thumbs/
 _thumbs/
 _thumbs/
-*/expressionengine/cache/*
+*/expressionengine/cache/*

+ 2 - 0
Fancy.gitignore

@@ -0,0 +1,2 @@
+*.rbc
+*.fyc

+ 0 - 1
Finale.gitignore

@@ -11,4 +11,3 @@
 # Some versions of Finale have a bug and randomly save extra copies of
 # Some versions of Finale have a bug and randomly save extra copies of
 # the music source as "<Filename> copy.mus"
 # the music source as "<Filename> copy.mus"
 *copy.mus
 *copy.mus
-

+ 1 - 1
ForceDotCom.gitignore

@@ -1,4 +1,4 @@
 .project
 .project
 .settings
 .settings
 salesforce.schema
 salesforce.schema
-Referenced Packages
+Referenced Packages

+ 0 - 1
GWT.gitignore

@@ -14,4 +14,3 @@ gwt-unitCache/
 # more caches and things from deploy #
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
 war/WEB-INF/classes/
-

+ 4 - 0
Global/Archives.gitignore

@@ -9,6 +9,7 @@
 *.bz2
 *.bz2
 *.xz
 *.xz
 *.lzma
 *.lzma
+*.cab
 
 
 #packing-only formats
 #packing-only formats
 *.iso
 *.iso
@@ -21,3 +22,6 @@
 *.egg
 *.egg
 *.deb
 *.deb
 *.rpm
 *.rpm
+*.msi
+*.msm
+*.msp

+ 4 - 0
Global/BricxCC.gitignore

@@ -0,0 +1,4 @@
+# Bricx Command Center IDE
+# http://bricxcc.sourceforge.net
+*.bak
+*.sym

+ 1 - 1
Global/CVS.gitignore

@@ -1,4 +1,4 @@
 /CVS/*
 /CVS/*
 */CVS/*
 */CVS/*
 .cvsignore
 .cvsignore
-*/.cvsignore
+*/.cvsignore

+ 2 - 0
Global/Cloud9.gitignore

@@ -0,0 +1,2 @@
+# Cloud9 IDE - http://c9.io
+.c9revisions

+ 4 - 2
Global/Eclipse.gitignore

@@ -1,6 +1,6 @@
 *.pydevproject
 *.pydevproject
-.project
 .metadata
 .metadata
+.gradle
 bin/**
 bin/**
 tmp/**
 tmp/**
 tmp/**/*
 tmp/**/*
@@ -9,7 +9,6 @@ tmp/**/*
 *.swp
 *.swp
 *~.nib
 *~.nib
 local.properties
 local.properties
-.classpath
 .settings/
 .settings/
 .loadpath
 .loadpath
 
 
@@ -24,3 +23,6 @@ local.properties
 
 
 # PDT-specific
 # PDT-specific
 .buildpath
 .buildpath
+
+# TeXlipse plugin
+.texlipse

+ 5 - 1
Global/Emacs.gitignore

@@ -1,8 +1,9 @@
+# -*- mode: gitignore; -*-
 *~
 *~
 \#*\#
 \#*\#
 /.emacs.desktop
 /.emacs.desktop
 /.emacs.desktop.lock
 /.emacs.desktop.lock
-.elc
+*.elc
 auto-save-list
 auto-save-list
 tramp
 tramp
 .\#*
 .\#*
@@ -10,3 +11,6 @@ tramp
 # Org-mode
 # Org-mode
 .org-id-locations
 .org-id-locations
 *_archive
 *_archive
+
+# flymake-mode
+*_flymake.*

+ 3 - 0
Global/Ensime.gitignore

@@ -0,0 +1,3 @@
+# Ensime specific
+.ensime
+.ensime_lucene/

+ 1 - 1
Global/Espresso.gitignore

@@ -1 +1 @@
-*.esproj
+*.esproj

+ 1 - 1
Global/FlexBuilder.gitignore

@@ -1,2 +1,2 @@
 bin/
 bin/
-bin-debug/
+bin-debug/

+ 0 - 4
Global/IntelliJ.gitignore

@@ -1,4 +0,0 @@
-*.iml
-*.ipr
-*.iws
-.idea/

+ 23 - 0
Global/JetBrains.gitignore

@@ -0,0 +1,23 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+
+## Directory-based project format
+.idea/
+# if you remove the above rule, at least ignore user-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# and these sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/

+ 2 - 0
Global/KDevelop4.gitignore

@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/

+ 3 - 0
Global/Kate.gitignore

@@ -0,0 +1,3 @@
+# Swap Files #
+.*.kate-swp
+.swp.*

+ 0 - 2
Global/Linux.gitignore

@@ -1,3 +1 @@
-.*
-!.gitignore
 *~
 *~

+ 1 - 1
Global/Matlab.gitignore

@@ -12,5 +12,5 @@
 # Compiled MEX binaries (all platforms)
 # Compiled MEX binaries (all platforms)
 *.mex*
 *.mex*
 
 
-# Simulink Code Generation	
+# Simulink Code Generation
 slprj/
 slprj/

+ 2 - 0
Global/NotepadPP.gitignore

@@ -0,0 +1,2 @@
+# Notepad++ backups #
+*.bak

+ 2 - 1
Global/OSX.gitignore

@@ -1,8 +1,9 @@
 .DS_Store
 .DS_Store
 .AppleDouble
 .AppleDouble
 .LSOverride
 .LSOverride
-Icon
 
 
+# Icon must ends with two \r.
+Icon

 
 
 # Thumbnails
 # Thumbnails
 ._*
 ._*

+ 0 - 1
Global/PhPStorm.gitignore

@@ -1 +0,0 @@
-.idea/

+ 0 - 4
Global/PyCharm.gitignore

@@ -1,4 +0,0 @@
-# PyCharm
-# http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
-.iml

+ 0 - 1
Global/RubyMine.gitignore

@@ -1 +0,0 @@
-.idea/workspace.xml

+ 1 - 1
Global/SASS.gitignore

@@ -1,2 +1,2 @@
-### SASS Ignores - "Sassy CSS" http://sass-lang.com/
+### Sass Ignores - "Sassy CSS" http://sass-lang.com/
 *.sass-cache
 *.sass-cache

+ 3 - 1
Global/SBT.gitignore

@@ -4,4 +4,6 @@
 target/
 target/
 lib_managed/
 lib_managed/
 src_managed/
 src_managed/
-project/boot/
+project/boot/
+.history
+.cache

+ 5 - 1
Global/SublimeText.gitignore

@@ -1,2 +1,6 @@
-# SublimeText project files
+# workspace files are user-specific
 *.sublime-workspace
 *.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project

+ 10 - 1
Global/Tags.gitignore

@@ -1,5 +1,14 @@
-# Ignore tags created by etags and ctags
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
 TAGS
 !TAGS/
 !TAGS/
 tags
 tags
 !tags/
 !tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
+

+ 1 - 0
Global/Vagrant.gitignore

@@ -0,0 +1 @@
+.vagrant/

+ 6 - 0
Global/Windows.gitignore

@@ -7,3 +7,9 @@ Desktop.ini
 
 
 # Recycle Bin used on file shares
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 $RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp

+ 2 - 1
Global/vim.gitignore

@@ -1,4 +1,5 @@
-*.s[a-w][a-z]
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
 *.un~
 *.un~
 Session.vim
 Session.vim
 .netrwhist
 .netrwhist

+ 0 - 8
Global/webMethods.gitignore

@@ -1,11 +1,3 @@
-#files
-*.bak
-*.class
-
-#licensefile
-Apache_License.txt
-
-#folders
 **/IntegrationServer/lib/
 **/IntegrationServer/lib/
 **/IntegrationServer/datastore/
 **/IntegrationServer/datastore/
 **/IntegrationServer/db/
 **/IntegrationServer/db/

+ 1 - 0
Go.gitignore

@@ -20,3 +20,4 @@ _cgo_export.*
 _testmain.go
 _testmain.go
 
 
 *.exe
 *.exe
+*.test

+ 0 - 2
Grails.gitignore

@@ -34,11 +34,9 @@
 # older plugin install locations
 # older plugin install locations
 /plugins
 /plugins
 /web-app/plugins
 /web-app/plugins
-/web-app/WEB-INF/classes
 
 
 # "temporary" build files
 # "temporary" build files
 /target
 /target
 
 
 # other
 # other
 *.iws
 *.iws
-

+ 4 - 0
Haskell.gitignore

@@ -5,3 +5,7 @@ cabal-dev
 *.chi
 *.chi
 *.chs.h
 *.chs.h
 .virthualenv
 .virthualenv
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+cabal.config

+ 4 - 0
Jboss.gitignore

@@ -13,3 +13,7 @@ jboss/server/minimal/log/*.log
 jboss/server/minimal/tmp/**/*
 jboss/server/minimal/tmp/**/*
 jboss/server/minimal/data/**/*
 jboss/server/minimal/data/**/*
 jboss/server/minimal/work/**/*
 jboss/server/minimal/work/**/*
+
+# deployed package files #
+
+*.DEPLOYED

+ 1 - 1
Joomla.gitignore

@@ -393,4 +393,4 @@ tmp/*
 configuration.php
 configuration.php
 index.php
 index.php
 joomla.xml
 joomla.xml
-*.txt
+*.txt

+ 1 - 1
Kohana.gitignore

@@ -1,2 +1,2 @@
 application/cache/*
 application/cache/*
-application/logs/*
+application/logs/*

+ 0 - 32
LaTeX.gitignore

@@ -1,32 +0,0 @@
-*.acn
-*.acr
-*.alg
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb_latexmk
-*.glg
-*.glo
-*.gls
-*.idx
-*.ilg
-*.ind
-*.ist
-*.lof
-*.log
-*.lot
-*.maf
-*.mtc
-*.mtc0
-*.nav
-*.nlo
-*.out
-*.pdfsync
-*.ps
-*.snm
-*.synctex.gz
-*.toc
-*.vrb
-*.xdy
-*.tdo

+ 3 - 1
Leiningen.gitignore

@@ -2,5 +2,7 @@ pom.xml
 *jar
 *jar
 /lib/
 /lib/
 /classes/
 /classes/
-/targets/
+/target/
 .lein-deps-sum
 .lein-deps-sum
+.lein-repl-history
+.lein-plugins/

+ 1 - 1
LemonStand.gitignore

@@ -18,4 +18,4 @@ install.php
 /modules/shop/*
 /modules/shop/*
 /modules/system/*
 /modules/system/*
 /modules/users/*
 /modules/users/*
-# add content_*.php if you don't want erase client changes to content
+# add content_*.php if you don't want erase client changes to content

+ 9 - 1
Magento.gitignore

@@ -15,14 +15,18 @@ app/etc/modules/Enterprise_*
 app/etc/modules/Find_Feed.xml
 app/etc/modules/Find_Feed.xml
 app/etc/modules/Mage_All.xml
 app/etc/modules/Mage_All.xml
 app/etc/modules/Mage_Api.xml
 app/etc/modules/Mage_Api.xml
+app/etc/modules/Mage_Api2.xml
 app/etc/modules/Mage_Authorizenet.xml
 app/etc/modules/Mage_Authorizenet.xml
 app/etc/modules/Mage_Bundle.xml
 app/etc/modules/Mage_Bundle.xml
+app/etc/modules/Mage_Captcha.xml
 app/etc/modules/Mage_Centinel.xml
 app/etc/modules/Mage_Centinel.xml
 app/etc/modules/Mage_Compiler.xml
 app/etc/modules/Mage_Compiler.xml
 app/etc/modules/Mage_Connect.xml
 app/etc/modules/Mage_Connect.xml
+app/etc/modules/Mage_CurrencySymbol.xml
 app/etc/modules/Mage_Downloadable.xml
 app/etc/modules/Mage_Downloadable.xml
 app/etc/modules/Mage_ImportExport.xml
 app/etc/modules/Mage_ImportExport.xml
 app/etc/modules/Mage_LoadTest.xml
 app/etc/modules/Mage_LoadTest.xml
+app/etc/modules/Mage_Oauth.xml
 app/etc/modules/Mage_PageCache.xml
 app/etc/modules/Mage_PageCache.xml
 app/etc/modules/Mage_Persistent.xml
 app/etc/modules/Mage_Persistent.xml
 app/etc/modules/Mage_Weee.xml
 app/etc/modules/Mage_Weee.xml
@@ -33,6 +37,7 @@ app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional
 app/etc/local.xml.additional
 app/etc/local.xml.template
 app/etc/local.xml.template
+app/etc/local.xml
 app/.htaccess
 app/.htaccess
 app/locale/
 app/locale/
 app/Mage.php
 app/Mage.php
@@ -45,7 +50,7 @@ get.php
 includes/
 includes/
 index.php
 index.php
 index.php.sample
 index.php.sample
-install.php
+/install.php
 js/blank.html
 js/blank.html
 js/calendar/
 js/calendar/
 js/enterprise/
 js/enterprise/
@@ -78,10 +83,13 @@ LICENSE.txt
 LICENSE_EE*
 LICENSE_EE*
 mage
 mage
 media/customer/
 media/customer/
+media/dhl/
 media/downloadable/
 media/downloadable/
 media/.htaccess
 media/.htaccess
 media/import/
 media/import/
 media/xmlconnect/
 media/xmlconnect/
+media/catalog/product/cache/
+
 nbproject/
 nbproject/
 pear
 pear
 pear/
 pear/

+ 1 - 0
Maven.gitignore

@@ -1 +1,2 @@
 target/
 target/
+ *.releaseBackup

+ 2 - 0
Meteor.gitignore

@@ -0,0 +1,2 @@
+.meteor/local
+.meteor/meteorite

+ 1 - 2
Node.gitignore

@@ -11,5 +11,4 @@ pids
 logs
 logs
 results
 results
 
 
-npm-debug.log
-node_modules
+node_modules

+ 7 - 4
Objective-C.gitignore

@@ -1,6 +1,8 @@
-# Xcode
+# OS X
 .DS_Store
 .DS_Store
-*/build/*
+
+# Xcode
+build/
 *.pbxuser
 *.pbxuser
 !default.pbxuser
 !default.pbxuser
 *.mode1v3
 *.mode1v3
@@ -10,11 +12,12 @@
 *.perspectivev3
 *.perspectivev3
 !default.perspectivev3
 !default.perspectivev3
 xcuserdata
 xcuserdata
+*.xccheckout
 profile
 profile
 *.moved-aside
 *.moved-aside
 DerivedData
 DerivedData
-.idea/
 *.hmap
 *.hmap
+*.xccheckout
 
 
-#CocoaPods
+# CocoaPods
 Pods
 Pods

+ 11 - 8
Perl.gitignore

@@ -1,5 +1,5 @@
-blib/
-.build/
+/blib/
+/.build/
 _build/
 _build/
 cover_db/
 cover_db/
 inc/
 inc/
@@ -7,10 +7,13 @@ Build
 !Build/
 !Build/
 Build.bat
 Build.bat
 .last_cover_stats
 .last_cover_stats
-Makefile
-Makefile.old
-MANIFEST.bak
-META.yml
-MYMETA.yml
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/META.yml
+/META.json
+/MYMETA.*
 nytprof.out
 nytprof.out
-pm_to_blib
+/pm_to_blib
+*.o
+*.bs

+ 1 - 6
PlayFramework.gitignore

@@ -1,10 +1,5 @@
-# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
-# Ignore all dotfiles...
-.*
-# except for .gitignore
-!.gitignore
-
 # Ignore Play! working directory #
 # Ignore Play! working directory #
+bin
 db
 db
 eclipse
 eclipse
 lib
 lib

+ 0 - 16
Plone.gitignore

@@ -1,4 +1,3 @@
-*~
 *.pyc
 *.pyc
 *.pyo
 *.pyo
 *.tmp*
 *.tmp*
@@ -7,17 +6,7 @@
 *.EGG
 *.EGG
 *.egg-info
 *.egg-info
 *.EGG-INFO
 *.EGG-INFO
-*.kpf
-*.swp
-*.wpr
 .*.cfg
 .*.cfg
-.installed.cfg
-.mr.developer.cfg
-.hg/
-.bzr/
-.svn/
-.project
-.pydevproject
 bin/
 bin/
 build/
 build/
 develop-eggs/
 develop-eggs/
@@ -27,8 +16,3 @@ fake-eggs/
 parts/
 parts/
 dist/
 dist/
 var/
 var/
-
-
-
-# OSX
-.DS_Store

+ 29 - 0
Prestashop.gitignore

@@ -0,0 +1,29 @@
+# Directories content
+cache/class_index.php
+cache/smarty/cache/*
+!cache/smarty/cache/index.php
+cache/smarty/compile/*
+!cache/smarty/compile/index.php
+cache/tcpdf/*
+!cache/tcpdf/index.php
+
+config/xml/*.xml
+config/settings.inc.php
+
+log/*.log
+
+img/*
+!img/index.php
+!img/*/index.php
+
+tools/smarty*/cache/*.php
+!tools/smarty*/cache/index.php
+tools/smarty*/compile/*.php
+!tools/smarty*/compile/index.php
+
+themes/default/cache/*.js
+themes/default/cache/*.css
+
+# Ignore files on root directory
+robots.txt
+sitemap.xml

+ 7 - 0
Processing.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+applet
+application.linux32
+application.linux64
+application.windows32
+application.windows64
+application.macosx

+ 27 - 15
Python.gitignore

@@ -1,31 +1,35 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
 *.py[cod]
 
 
 # C extensions
 # C extensions
 *.so
 *.so
 
 
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
+# Distribution / packaging
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
 .installed.cfg
 .installed.cfg
-lib
-lib64
-__pycache__
+*.egg
 
 
 # Installer logs
 # Installer logs
 pip-log.txt
 pip-log.txt
+pip-delete-this-directory.txt
 
 
 # Unit test / coverage reports
 # Unit test / coverage reports
+.tox/
 .coverage
 .coverage
-.tox
+.cache
 nosetests.xml
 nosetests.xml
+coverage.xml
 
 
 # Translations
 # Translations
 *.mo
 *.mo
@@ -34,3 +38,11 @@ nosetests.xml
 .mr.developer.cfg
 .mr.developer.cfg
 .project
 .project
 .pydevproject
 .pydevproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
+

+ 6 - 1
Qt.gitignore

@@ -16,5 +16,10 @@
 *.pro.user.*
 *.pro.user.*
 moc_*.cpp
 moc_*.cpp
 qrc_*.cpp
 qrc_*.cpp
-Makefile
+ui_*.h
+Makefile*
 *-build-*
 *-build-*
+
+# QtCreator
+
+*.autosave

+ 1 - 1
R.gitignore

@@ -2,4 +2,4 @@
 .Rhistory
 .Rhistory
 
 
 # Example code in package build process
 # Example code in package build process
-*-Ex.R
+*-Ex.R

+ 66 - 28
README.md

@@ -1,41 +1,79 @@
-# A Collection of Useful .gitignore Templates
+# A collection of `.gitignore` templates
 
 
-That's what we're trying to build. Please contribute
-by [forking][fk] and sending a [pull request][pr].
+This is GitHub’s collection of [`.gitignore`][man] file templates.
+We use this list to populate the `.gitignore` template choosers available
+in the GitHub.com interface when creating new repositories and files.
 
 
-Also **please** only modify **one file** per commit. This'll
-make merging easier for everyone.
+For more information about how `.gitignore` files work, and how to use them,
+the following resources are a great place to start:
 
 
-Global gitignores (OS-specific, editor-specific) should go into the
-`Global/` directory.
+- The [Ignoring Files chapter][chapter] of the [Pro Git][progit] book.
+- The [Ignoring Files article][help] on the GitHub Help site.
+- The [gitignore(5)][man] manual page.
 
 
-For more information on gitignore: [gitignore(5)][g5]
+[man]: http://git-scm.com/docs/gitignore
+[help]: https://help.github.com/articles/ignoring-files
+[chapter]: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files
+[progit]: http://git-scm.com/book
 
 
-[fk]: http://help.github.com/forking/
-[pr]: http://help.github.com/pull-requests/
-[g5]: http://man.cx/gitignore
+## Folder structure
+
+The files in the root directory are for `.gitignore` templates that are
+project specific, such as language or framework specific templates.
+Global (operating system or editor specific) templates should go into the
+[`Global/`](./Global) directory.
+
+## Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
 
 
-## Pull Requests
+- **Provide a link to the application or project’s homepage**. Unless it’s
+  extremely popular, there’s a chance the maintainers don’t know about or use
+  the language, framework, editor, app, or project your change applies to.
+  
+- **Provide links to documentation** supporting the change you’re making.
+  Current, canonical documentation mentioning the files being ignored is best.
+  If documentation isn’t available to support your change, do the best you can
+  to explain what the files being ignored are for.
+  
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+  take a sentence or two to tell us why your change or addition should happen.
+  It’s especially helpful to articulate why this change applies to *everyone*
+  who works with the applicable technology, rather than just you or your team.
+  
+- **Please consider the scope of your change**. If your change specific to a
+  certain language or framework, then make sure the change is made to the
+  template for that language or framework, rather than to the template for an
+  editor, tool, or operating system.
 
 
-Since this repo includes a large and diverse
-number of programming languages, frameworks, editors,
-and ecosystems, it's **very helpful** if you can provide 
-a link to information supporting your pull request. 
-Up-to-date, canonical documentation that mentions the files 
-to be ignored is best.
+- **Please only modify *one template* per pull request**. This helps keep pull
+  requests and feedback focused on a specific project or technology.
 
 
-This ensures we can efficiently go through pull requests
-and keep quality high.
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
 
 
-## Global Ignores
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.
 
 
-git has a global configuration that applies rules to all of
-your projects. For example:
+## Contributing workflow
 
 
-    git config --global core.excludesfile ~/.global_ignore
+Here’s how we suggest you go about proposing a change to this project:
+
+1. [Fork this project][fork] to your account.
+2. [Create a branch][branch] for the change you intend to make.
+3. Make your changes to your fork.
+4. [Send a pull request][pr] from your fork’s branch to our `master` branch.
+
+Using the web-based interface to make changes is fine too, and will help you
+by automatically forking the project and prompting to send a pull request too.
+
+[fork]: http://help.github.com/forking/
+[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
+[pr]: http://help.github.com/pull-requests/
 
 
-... will apply the rules in ~/.global_ignore for all of your repos.
+## License
 
 
-This is useful if you use an editor (like Emacs) that drops backup files,
-or if you work in an environment that generates binary or intermediate
-files that are always ignored.
+[MIT](./LICENSE).

+ 14 - 8
Rails.gitignore

@@ -3,17 +3,23 @@
 .sass-cache
 .sass-cache
 capybara-*.html
 capybara-*.html
 .rspec
 .rspec
-.rvmrc
-/.bundle
-/vendor/bundle
-/log/*
-/tmp/*
+/log
+/tmp
 /db/*.sqlite3
 /db/*.sqlite3
-/public/system/*
+/public/system
 /coverage/
 /coverage/
-/spec/tmp/*
+/spec/tmp
 **.orig
 **.orig
 rerun.txt
 rerun.txt
 pickle-email-*.html
 pickle-email-*.html
-.project
 config/initializers/secret_token.rb
 config/initializers/secret_token.rb
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

+ 26 - 15
Ruby.gitignore

@@ -1,18 +1,29 @@
 *.gem
 *.gem
 *.rbc
 *.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
 
 
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

+ 20 - 0
RubyMotion.gitignore

@@ -0,0 +1,20 @@
+.dat*
+.repl_history
+build/
+tags
+
+# Editor files
+.DS_Store
+nbproject
+.redcar
+*.swp
+*.swo
+~
+.eprj
+vendor/Pods
+*.nib
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

+ 4 - 1
Scala.gitignore

@@ -2,6 +2,9 @@
 *.log
 *.log
 
 
 # sbt specific
 # sbt specific
+.cache/
+.history/
+.lib/
 dist/*
 dist/*
 target/
 target/
 lib_managed/
 lib_managed/
@@ -10,4 +13,4 @@ project/boot/
 project/plugins/project/
 project/plugins/project/
 
 
 # Scala-IDE specific
 # Scala-IDE specific
-.scala_dependencies
+.scala_dependencies

+ 0 - 1
Sdcc.gitignore

@@ -6,4 +6,3 @@
 *.rel
 *.rel
 *.rst
 *.rst
 *.sym
 *.sym
-

+ 1 - 1
Symfony.gitignore

@@ -12,4 +12,4 @@ lib/model/doctrine/base/Base*
 lib/model/doctrine/*Plugin/base/Base*
 lib/model/doctrine/*Plugin/base/Base*
 lib/model/om/*
 lib/model/om/*
 lib/model/map/*
 lib/model/map/*
-web/*Plugin/*
+web/*Plugin/*

+ 3 - 0
Symfony2.gitignore

@@ -11,3 +11,6 @@ web/bundles/*
 # Configuration files
 # Configuration files
 app/config/parameters.ini
 app/config/parameters.ini
 app/config/parameters.yml
 app/config/parameters.yml
+
+# Composer
+composer.phar

+ 78 - 0
TeX.gitignore

@@ -0,0 +1,78 @@
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+
+## Intermediate documents:
+*.dvi
+# these rules might exclude image files for figures etc.
+# *.ps
+# *.eps
+# *.pdf
+
+## Bibliography auxiliary files (bibtex/biblatex/biber):
+*.bbl
+*.bcf
+*.blg
+*-blx.aux
+*-blx.bib
+*.run.xml
+
+## Build tool auxiliary files:
+*.fdb_latexmk
+*.synctex.gz
+*.pdfsync
+
+## Auxiliary and intermediate files from other packages:
+
+# algorithms
+*.alg
+*.loa
+
+# amsthm
+*.thm
+
+# beamer
+*.nav
+*.snm
+*.vrb
+
+# glossaries
+*.acn
+*.acr
+*.glg
+*.glo
+*.gls
+
+# hyperref
+*.brf
+
+# listings
+*.lol
+
+# makeidx
+*.idx
+*.ilg
+*.ind
+*.ist
+
+# minitoc
+*.maf
+*.mtc
+*.mtc0
+
+# minted
+*.pyg
+
+# nomencl
+*.nlo
+
+# todonotes
+*.tdo
+
+# xindy
+*.xdy

+ 3 - 3
Typo3.gitignore

@@ -1,4 +1,4 @@
-## Typo3
+## TYPO3 v4
 # Ignore serveral upload and file directories.
 # Ignore serveral upload and file directories.
 /fileadmin/user_upload/
 /fileadmin/user_upload/
 /fileadmin/_temp_/
 /fileadmin/_temp_/
@@ -12,7 +12,7 @@
 /typo3conf/localconf_local.php
 /typo3conf/localconf_local.php
 # Ignore system folders, you should have them symlinked.
 # Ignore system folders, you should have them symlinked.
 # If not comment out the following two entries.
 # If not comment out the following two entries.
-/typo3/
-/t3lib/
+/typo3
+/t3lib
 # Ignore temp directory.
 # Ignore temp directory.
 /typo3temp/
 /typo3temp/

+ 5 - 3
Unity.gitignore

@@ -3,6 +3,8 @@
 [Oo]bj/
 [Oo]bj/
 
 
 # Autogenerated VS/MD solution and project files
 # Autogenerated VS/MD solution and project files
-*.csproj
-*.unityproj
-*.sln
+/*.csproj
+/*.unityproj
+/*.sln
+/*.suo
+/*.user

+ 7 - 0
VVVV.gitignore

@@ -0,0 +1,7 @@
+
+# .v4p backup files
+*~.xml
+
+# Dynamic plugins .dll
+bin/
+

+ 36 - 7
VisualStudio.gitignore

@@ -7,11 +7,12 @@
 *.sln.docstates
 *.sln.docstates
 
 
 # Build results
 # Build results
-
 [Dd]ebug/
 [Dd]ebug/
+[Dd]ebugPublic/
 [Rr]elease/
 [Rr]elease/
 x64/
 x64/
 build/
 build/
+bld/
 [Bb]in/
 [Bb]in/
 [Oo]bj/
 [Oo]bj/
 
 
@@ -22,8 +23,13 @@ build/
 [Tt]est[Rr]esult*/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 [Bb]uild[Ll]og.*
 
 
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
 *_i.c
 *_i.c
 *_p.c
 *_p.c
+*_i.h
 *.ilk
 *.ilk
 *.meta
 *.meta
 *.obj
 *.obj
@@ -43,9 +49,12 @@ build/
 *.vssscc
 *.vssscc
 .builds
 .builds
 *.pidb
 *.pidb
-*.log
+*.svclog
 *.scc
 *.scc
 
 
+# Chutzpah Test files
+_Chutzpah*
+
 # Visual C++ cache files
 # Visual C++ cache files
 ipch/
 ipch/
 *.aps
 *.aps
@@ -59,12 +68,19 @@ ipch/
 *.vsp
 *.vsp
 *.vspx
 *.vspx
 
 
+# TFS 2012 Local Workspace
+$tf/
+
 # Guidance Automation Toolkit
 # Guidance Automation Toolkit
 *.gpState
 *.gpState
 
 
 # ReSharper is a .NET coding add-in
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
 
 
 # TeamCity is a build add-in
 # TeamCity is a build add-in
 _TeamCity*
 _TeamCity*
@@ -74,8 +90,13 @@ _TeamCity*
 
 
 # NCrunch
 # NCrunch
 *.ncrunch*
 *.ncrunch*
+_NCrunch_*
 .*crunch*.local.xml
 .*crunch*.local.xml
 
 
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
 # Installshield output folder
 # Installshield output folder
 [Ee]xpress/
 [Ee]xpress/
 
 
@@ -94,14 +115,16 @@ publish/
 
 
 # Publish Web Output
 # Publish Web Output
 *.Publish.xml
 *.Publish.xml
-*.pubxml
+*.azurePubxml
 
 
 # NuGet Packages Directory
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 #packages/
 #packages/
+## TODO: If the tool you use requires repositories.config, also uncomment the next line
+#!packages/repositories.config
 
 
 # Windows Azure Build Output
 # Windows Azure Build Output
-csx
+csx/
 *.build.csdef
 *.build.csdef
 
 
 # Windows Store app package directory
 # Windows Store app package directory
@@ -115,6 +138,7 @@ ClientBin/
 ~$*
 ~$*
 *~
 *~
 *.dbmdl
 *.dbmdl
+*.dbproj.schemaview
 *.[Pp]ublish.xml
 *.[Pp]ublish.xml
 *.pfx
 *.pfx
 *.publishsettings
 *.publishsettings
@@ -133,6 +157,14 @@ UpgradeLog*.htm
 App_Data/*.mdf
 App_Data/*.mdf
 App_Data/*.ldf
 App_Data/*.ldf
 
 
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
 # =========================
 # =========================
 # Windows detritus
 # Windows detritus
 # =========================
 # =========================
@@ -146,6 +178,3 @@ Desktop.ini
 
 
 # Recycle Bin used on file shares
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 $RECYCLE.BIN/
-
-# Mac crap
-.DS_Store

+ 1 - 2
WordPress.gitignore

@@ -1,5 +1,4 @@
 .htaccess
 .htaccess
-wp-config.php
 wp-content/uploads/
 wp-content/uploads/
 wp-content/blogs.dir/
 wp-content/blogs.dir/
 wp-content/upgrade/
 wp-content/upgrade/
@@ -10,4 +9,4 @@ sitemap.xml
 *.log
 *.log
 wp-content/cache/
 wp-content/cache/
 wp-content/backups/
 wp-content/backups/
-sitemap.xml.gz
+sitemap.xml.gz

+ 6 - 3
Yii.gitignore

@@ -1,3 +1,6 @@
-assets/
-protected/runtime/
-themes/classic/views/
+assets/*
+!assets/.gitignore
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/

+ 0 - 1
ZendFramework.gitignore

@@ -3,4 +3,3 @@ LICENSE.txt
 README.txt
 README.txt
 demos/
 demos/
 extras/documentation
 extras/documentation
-

+ 3 - 0
nanoc.gitignore

@@ -5,3 +5,6 @@ output/
 
 
 # Temporary file directory
 # Temporary file directory
 tmp/
 tmp/
+
+# Crash Log
+crash.log