Merge pull request github#1 from github/master

Updating fork
neonix20b · Apr 8, 2014 · 38ba69c · 38ba69c
2 parents eda2ee7 + b3d27fc
commit 38ba69c
Show file tree

Hide file tree

Showing 31 changed files with 111 additions and 42 deletions.
diff --git a/Ada.gitignore b/Ada.gitignore
@@ -2,4 +2,4 @@
 *.o
 
 # Ada Library Information
-*.ali
+*.ali
diff --git a/ArchLinuxPackages.gitignore b/ArchLinuxPackages.gitignore
@@ -1,5 +1,7 @@
 *.tar
 *.tar.*
+*.zip
+*.tgz
 *.log
 *.log.*
 *.sig

diff --git a/DM.gitignore b/DM.gitignore
@@ -2,4 +2,4 @@
 *.rsc
 *.int
 *.lk
-*.zip
+*.zip
diff --git a/Dart.gitignore b/Dart.gitignore
@@ -1,11 +1,13 @@
-# Don’t commit the following files and directories created by pub and dart2js
+# Don’t commit the following directories created by pub.
+build/
 packages/
+
+# Or the files created by dart2js.
+*.dart.js
+*.dart.precompiled.js
 *.js_
 *.js.deps
 *.js.map
 
-# Include when developing application packages
+# Include when developing application packages.
 pubspec.lock
-
-# Avoid committing generated JavaScript files
-*.dart.js
diff --git a/Delphi.gitignore b/Delphi.gitignore
@@ -35,6 +35,7 @@
 *.dres
 *.rsm
 *.tds
+*.dcu
 
 # Delphi autogenerated files (duplicated info)
 *.cfg

diff --git a/Drupal.gitignore b/Drupal.gitignore
@@ -2,7 +2,6 @@
 sites/*/*settings*.php
 
 # Ignore paths that contain generated content.
-cache/
 files/
 sites/*/files
 sites/*/private

diff --git a/EPiServer.gitignore b/EPiServer.gitignore
@@ -1,4 +1,4 @@
 ######################
 ## EPiServer Files
 ######################
-*License.config
+*License.config
diff --git a/Fancy.gitignore b/Fancy.gitignore
@@ -1,2 +1,2 @@
 *.rbc
-*.fyc
+*.fyc
diff --git a/Global/Ensime.gitignore b/Global/Ensime.gitignore
@@ -1,3 +1,3 @@
 # Ensime specific
 .ensime
-.ensime_lucene/
+.ensime_lucene/
diff --git a/Global/FlexBuilder.gitignore b/Global/FlexBuilder.gitignore
@@ -1,2 +1,3 @@
 bin/
 bin-debug/
+bin-release/
diff --git a/Global/Lazarus.gitignore b/Global/Lazarus.gitignore
@@ -9,4 +9,4 @@ lib/
 *.ppu
 
 #exclude executable output in windows
-*.exe
+*.exe
diff --git a/Global/NotepadPP.gitignore b/Global/NotepadPP.gitignore
@@ -1,2 +1,2 @@
 # Notepad++ backups #
-*.bak
+*.bak
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
@@ -11,3 +11,10 @@ Icon
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+

diff --git a/Global/SlickEdit.gitignore b/Global/SlickEdit.gitignore
@@ -0,0 +1,11 @@
+# SlickEdit workspace and project files are ignored by default because
+# typically they are considered to be developer-specific and not part of a
+# project.
+*.vpw
+*.vpj
+
+# SlickEdit workspace history and tag files always contain user-specific
+# data so they should not be stored in a repository.
+*.vpwhistu
+*.vpwhist
+*.vtg
diff --git a/Global/SublimeText.gitignore b/Global/SublimeText.gitignore
@@ -4,3 +4,6 @@
 # project files should be checked into the repository, unless a significant
 # proportion of contributors will probably not be using SublimeText
 # *.sublime-project
+
+#sftp configuration file
+sftp-config.json
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
@@ -0,0 +1,13 @@
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
diff --git a/Maven.gitignore b/Maven.gitignore
@@ -1,5 +1,6 @@
 target/
 pom.xml.tag
 pom.xml.releaseBackup
+pom.xml.versionsBackup
 pom.xml.next
 release.properties
diff --git a/Meteor.gitignore b/Meteor.gitignore
@@ -1,2 +1,2 @@
 .meteor/local
-.meteor/meteorite
+.meteor/meteorite
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -1,4 +1,5 @@
 # Xcode
+#
 build/
 *.pbxuser
 !default.pbxuser
@@ -10,11 +11,15 @@ build/
 !default.perspectivev3
 xcuserdata
 *.xccheckout
-profile
 *.moved-aside
 DerivedData
 *.hmap
 *.ipa
 
 # CocoaPods
-Pods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
+#
+# Pods/
diff --git a/OpenCart.gitignore b/OpenCart.gitignore
@@ -0,0 +1,11 @@
+.htaccess
+config.php
+admin/config.php
+
+!index.html
+
+download/
+image/data/
+image/cache/
+system/cache/
+system/logs/
diff --git a/Packer.gitignore b/Packer.gitignore
@@ -0,0 +1,5 @@
+# Cache objects
+packer_cache/
+
+# For built boxes
+*.box
diff --git a/Phalcon.gitignore b/Phalcon.gitignore
@@ -0,0 +1,2 @@
+/cache/
+/config/development/
diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
@@ -1,19 +1,17 @@
 # Ignore Play! working directory #
-bin
-db
-eclipse
-lib
-log
-logs
-modules
-precompiled
-project/project
-project/target
-target
-tmp
+bin/
+/db
+.eclipse
+/lib/
+/logs/
+/modules
+/project/project
+/project/target
+/target
+tmp/
 test-result
 server.pid
 *.iml
 *.eml
-dist
+/dist/
 .cache
diff --git a/Prestashop.gitignore b/Prestashop.gitignore
@@ -26,4 +26,4 @@ themes/default/cache/*.css
 
 # Ignore files on root directory
 robots.txt
-sitemap.xml
+sitemap.xml
diff --git a/Qt.gitignore b/Qt.gitignore
@@ -12,8 +12,11 @@
 
 # Qt-es
 
+/.qmake.cache
+/.qmake.stash
 *.pro.user
 *.pro.user.*
+*.moc
 moc_*.cpp
 qrc_*.cpp
 ui_*.h

diff --git a/R.gitignore b/R.gitignore
@@ -3,3 +3,6 @@
 
 # Example code in package build process
 *-Ex.R
+
+# R data files from past sessions
+.Rdata
diff --git a/Rails.gitignore b/Rails.gitignore
@@ -10,6 +10,8 @@ capybara-*.html
 **.orig
 rerun.txt
 pickle-email-*.html
+
+# TODO Comment out this rules if you are OK with secrets been uploaded to the repo
 config/initializers/secret_token.rb
 config/secrets.yml
 

diff --git a/TeX.gitignore b/TeX.gitignore
@@ -72,6 +72,16 @@
 # nomencl
 *.nlo
 
+# sagetex
+*.sagetex.sage
+*.sagetex.py
+*.sagetex.scmd
+
+# sympy
+*.sout
+*.sympy
+sympy-plots-for-*.tex/
+
 # todonotes
 *.tdo
 

diff --git a/VVVV.gitignore b/VVVV.gitignore
@@ -4,4 +4,3 @@
 
 # Dynamic plugins .dll
 bin/
-
diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore
@@ -91,7 +91,6 @@ _TeamCity*
 *.dotCover
 
 # NCrunch
-*.ncrunch*
 _NCrunch_*
 .*crunch*.local.xml
 
@@ -121,6 +120,8 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
+## TODO: Comment the next line if you want to checkin your web deploy settings but do note that will include unencrypted passwords
+*.pubxml
 
 # NuGet Packages Directory
 packages/

diff --git a/opencart.gitignore b/opencart.gitignore
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ @@
     *.o
     # Ada Library Information
-    *.ali
+    *.ali