Diffusion gitignore 412d6907bcfd

Merging upstream
412d6907bcfd
Actions

Authored by Nick Hodges <nickhodges@gmail.com> on Nov 27 2013, 21:03.

Description

Merging upstream

Details

Committed

Nick Hodges <nickhodges@gmail.com>

Nov 27 2013, 21:03

Pushed

aubort

Jul 2 2018, 16:12

Parents

rGITIGNOREa6dc172eaa6e: Merge pull request #879 from phmarek/master
rGITIGNORE6ae5f35a5eb6: Update Delphi to include new extensions

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Hodges <nickhodges@gmail.com> committed rGITIGNORE412d6907bcfd: Merging upstream (authored by Nick Hodges <nickhodges@gmail.com>).Nov 27 2013, 21:03

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
a6dc172eaa6e	Adam Roben	Merge pull request #879 from phmarek/master	Nov 27 2013
1c7c01521a4f	Adam Roben	Merge pull request #878 from minsOne/master	Nov 27 2013
b81b5f92d7a1	Adam Roben	Merge pull request #788 from sjwoodr/master	Nov 27 2013
48b7b84b62d2	Steve Woodruff	Java ME update for .mtj.tmp	Nov 27 2013
277b8358f8c4	Philipp Marek	Added file for Common Lisp.	Nov 27 2013
e3fd04426861	minsOne	Added ipa file to Objective-C.gitignore	Nov 27 2013
513d1aab1f94	Adam Roben	Merge pull request #876 from jmillerdesign/patch-2	Nov 27 2013
413a9892b5e4	J. Miller	Use absolute paths to the files to ignore	Nov 27 2013
759bcc3e6246	Adam Roben	Merge pull request #875 from four04/add-common-linux-compile-file-extensions	Nov 27 2013
753c995244d9	Adam Roben	Merge pull request #871 from mattrubin/master	Nov 27 2013
c2c74647f25d	Adam Roben	Merge pull request #869 from j4y/master	Nov 27 2013
cbda8a4d7f2a	Adam Roben	Merge pull request #870 from CaseyB/master	Nov 27 2013
288442e18011	Adam Roben	Merge pull request #866 from stefan-vatov/master	Nov 27 2013
c76bbb50c05c	Kristofer Rye	Merge branch 'master' into add-common-linux-compile-file-extensions	Nov 27 2013
6604167da55f	Adam Roben	Merge pull request #864 from oschrenk/patch-4	Nov 27 2013
a79b082024c3	Kristofer Rye	Merge branch 'master' into add-common-linux-compile-file-extensions	Nov 27 2013
43c205b5dfe4	Adam Roben	Merge pull request #862 from jaseemabid/emacs	Nov 27 2013
3fb1b419f204	Adam Roben	Merge pull request #861 from jaseemabid/elisp	Nov 27 2013
c8d99ff85725	Kristofer Rye	Merge branch 'master' into add-common-linux-compile-file-extensions	Nov 27 2013
8e9563a7c928	Adam Roben	Merge pull request #856 from oschrenk/patch-3	Nov 27 2013
cea67aabe0af	Adam Roben	Merge pull request #853 from danieljabailey/master	Nov 27 2013
0bd7638db905	Adam Roben	Merge pull request #852 from kdeldycke/patch-1	Nov 27 2013
a07745af8bb2	Adam Roben	Merge pull request #851 from rsolomo/patch-1	Nov 27 2013
8cc9533f3481	Adam Roben	Merge pull request #850 from Jiri-Kremser/master	Nov 27 2013
926389c7ccb6	Adam Roben	Merge pull request #849 from Danimoth/patch-1	Nov 27 2013
38488f24407e	Kristofer Rye	Merge branch 'master' into add-common-linux-compile-file-extensions	Nov 27 2013
80f79ec2af03	Adam Roben	Merge pull request #536 from troii/gradle	Nov 27 2013
51a1221f5080	Adam Roben	Merge pull request #835 from ggirou/master	Nov 27 2013
93b7ac4c09b7	Kristofer Rye	Merge branch 'master' into add-common-linux-compile-file-extensions	Nov 27 2013
ddef3121c60b	Adam Roben	Merge pull request #728 from zyrx/master	Nov 27 2013
c16b3bb8cf33	Kristofer Rye	Merge branch 'master' of git://github.com/github/gitignore into add-common…	Nov 27 2013
ecfdeba71ed8	Adam Roben	Merge pull request #817 from jimmyandrade/patch-1	Nov 27 2013
5e5dd80518e4	Adam Roben	Merge pull request #812 from sableloki/patch-for-yeoman	Nov 27 2013
06a3ead3d1eb	Adam Roben	Merge pull request #800 from johnkharvey/stella	Nov 27 2013
741defffddbe	Adam Roben	Merge pull request #806 from torokmark/master	Nov 27 2013
4424d80352ee	Adam Roben	Merge pull request #789 from Lance0312/archlinuxpkg	Nov 27 2013
82c8b636e9da	Adam Roben	Merge pull request #777 from fivef/master	Nov 27 2013
bb53647b8ab8	Adam Roben	Merge pull request #726 from jtimberman/chef-cookbook	Nov 27 2013
0ecd3eed9910	Matt Rubin	Remove duplicate line in Objective-C.gitignore	Nov 25 2013
6131fd3bccfa	Borders, Casey	Ignore MonoDevelop cache files	Nov 22 2013
e884da3fd3e4	Jay Prall	plugin.xml shouldn't be in source control	Nov 22 2013
4462ee9f9fdf	Oliver Schrenk	Ignore worksheet directory	Nov 20 2013
882b876005bd	Jaseem Abid	Ignore file for elisp projects	Nov 19 2013
f2656a471618	Oliver Schrenk	Ignore files created by maven-release-plugin	Nov 15 2013
207cddf155ac	Jaseem Abid	Ignore elpa and eshell generated files	Nov 14 2013
f0f5e38db203	Justin Spahr-Summers	Merge pull request #760	Nov 13 2013
4a7ab0638292	Justin Spahr-Summers	Remove generic and Java ignore patterns	Nov 13 2013
e57da65843ec	unknown	Moved file to Global	Nov 13 2013
27569799cb61	Daniel Bailey	Added lazarus ignore file in the global dir this time	Nov 13 2013
b10fa9c7d63b	Daniel Bailey	Merge branch 'master' of https://github.com/github/gitignore	Nov 13 2013

Changes (103)

				Path
	M			Actionscript.gitignore
	A			Ada.gitignore
	A			Agda.gitignore
	M			Android.gitignore
	A			ArchLinuxPackages.gitignore
	M			Autotools.gitignore
	M			C++.gitignore
	M			C.gitignore
	M			CONTRIBUTING.md
	M			CakePHP.gitignore
	A			ChefCookbook.gitignore
	M			CodeIgniter.gitignore
	A			CommonLisp.gitignore
	A			Composer.gitignore
	M			Concrete5.gitignore
	M			Coq.gitignore
	M			Dart.gitignore
	M			Delphi.gitignore
	D			Django.gitignore
	M			Drupal.gitignore
	A			EPiServer.gitignore
	A			Elisp.gitignore
	M			ExpressionEngine.gitignore
	A			Fancy.gitignore
	M			Finale.gitignore
	M			ForceDotCom.gitignore
	M			GWT.gitignore
	M			Global/Archives.gitignore
	A			Global/BricxCC.gitignore
	M			Global/CVS.gitignore
	A			Global/Cloud9.gitignore
	A			Global/DartEditor.gitignore
	A			Global/Dreamweaver.gitignore
	M			Global/Eclipse.gitignore
	M			Global/Emacs.gitignore
	A			Global/Ensime.gitignore
	M			Global/Espresso.gitignore
	M			Global/FlexBuilder.gitignore
	D			Global/IntelliJ.gitignore
	A			Global/JetBrains.gitignore
	A			Global/KDevelop4.gitignore
	A			Global/Kate.gitignore
	A			Global/Lazarus.gitignore
	M			Global/Linux.gitignore
	M			Global/Matlab.gitignore
	A			Global/NotepadPP.gitignore
	M			Global/OSX.gitignore
	D			Global/PhPStorm.gitignore
	D			Global/PyCharm.gitignore
	D			Global/RubyMine.gitignore
	M			Global/SASS.gitignore
	M			Global/SBT.gitignore
	M			Global/SublimeText.gitignore
	M			Global/Tags.gitignore
	A			Global/Vagrant.gitignore
	M			Global/Windows.gitignore
	M			Global/vim.gitignore
	A			Global/webMethods.gitignore
	M			Go.gitignore
	A			Gradle.gitignore
	M			Grails.gitignore
	M			Haskell.gitignore
	M			Java.gitignore
	M			Jboss.gitignore
	M			Joomla.gitignore
	M			Kohana.gitignore
	D			LaTeX.gitignore
	M			Leiningen.gitignore
	M			LemonStand.gitignore
	M			Magento.gitignore
	M			Maven.gitignore
	A			Meteor.gitignore
	M			Node.gitignore
	M			Objective-C.gitignore
	M			Perl.gitignore
	M			PlayFramework.gitignore
	M			Plone.gitignore
	A			Prestashop.gitignore
	A			Processing.gitignore
	M			Python.gitignore
	M			Qt.gitignore
	M			R.gitignore
	M			README.md
	A			ROS.gitignore
	M			Rails.gitignore
	M			Ruby.gitignore
	A			RubyMotion.gitignore
	M			Scala.gitignore
	A			Scrivener.gitignore
	M			Sdcc.gitignore
	M			Symfony.gitignore
	M			Symfony2.gitignore
	A			TeX.gitignore
	M			Typo3.gitignore
	M			Unity.gitignore
	A			VVVV.gitignore
	M			VisualStudio.gitignore
	M			WordPress.gitignore
	A			Yeoman.gitignore
	M			Yii.gitignore
	M			ZendFramework.gitignore
	M			nanoc.gitignore
	A			stella.gitignore