Homec4science

Merge branch 'master' of https://github.com/github/gitignore

Authored by Borders, Casey <casey.borders@gsw-w.com> on Jan 30 2014, 22:40.

Description

Merge branch 'master' of https://github.com/github/gitignore

Event Timeline

Borders, Casey <casey.borders@gsw-w.com> committed rGITIGNOREb99887e1de0a: Merge branch 'master' of https://github.com/github/gitignore (authored by Borders, Casey <casey.borders@gsw-w.com>).Jan 30 2014, 22:40

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
ea1dc4f7eb87Markus Olsson
Merge pull request #932 from fredgate/master 
Jan 30 2014
1e476cd7a9e2Carl Suster
Merge pull request #925 from friederbluemle/update-android-gitignore 
Jan 30 2014
41b324bd0a0cfredgate
Add ignore for web workbench add-on (sass files). 
Jan 28 2014
631f8760c689Frieder Bluemle
Improve Android .gitignore comments 
Jan 17 2014
5979282c55daAdam Roben
Merge pull request #912 from stuartpb/patch-1 
Jan 7 2014
5244c6152f20Adam Roben
Merge pull request #911 from mickeypuri/visualstudio 
Jan 7 2014
54d15a07e063Adam Roben
Merge pull request #909 from Stijn-Flipper/wordpress-fix 
Jan 7 2014
d42b9bba2cb5Adam Roben
Merge pull request #907 from pimterry/nodeGitignore 
Jan 7 2014
c8a371e096fcAdam Roben
Merge pull request #906 from arinto/new-ignore-for-Eclipse-SBT 
Jan 7 2014
c822fc24960cAdam Roben
Merge pull request #905 from arinto/new-ignore-in-play-2.2.x 
Jan 7 2014
b6fb1a9f0025Adam Roben
Merge pull request #899 from andrewwutw/master 
Jan 7 2014
8423d07b8586Adam Roben
Merge pull request #893 from dng-dev/patch-1 
Jan 7 2014
fcabd615a541Adam Roben
Merge pull request #883 from richorama/master 
Jan 7 2014
042f8bf538a5Adam Roben
Merge pull request #840 from jan0sch/SugarCRM 
Jan 7 2014
446ba8454df3Stuart P. Bentley
Update Cloud9.gitignore 
Jan 3 2014
e0077c3900b0Mickey Puri
fixed handling of nuget packages 
Jan 1 2014
68c34eff0ec3Stijn-Flipper
also ignore sensitive configuration data 
Dec 28 2013
8209359a888aTim Perry
Ignore grunt and lcov build files in Node projects 
Dec 27 2013
791e8ed0aea0Arinto Murdopo
Add output directory of sbteclipse plugin, which is ".target" directory. 
Dec 25 2013
5f10e3559880Arinto Murdopo
Add "dist" and ".cache" folders for Play 2.2.x Link: http://www.playframework. 
Dec 25 2013
1d724a505e84andrewwutw
Added SCons.gitignore 
Dec 17 2013
07e4992c29faMarkus Olsson
Merge pull request #896 from github/ignore-rails-config-secret 
Dec 16 2013
da654e84c6eeMarkus Olsson
Merge pull request #891 from hulet/duplicate-fix 
Dec 16 2013
8c525145acc1Shawn Davenport
secrets.yml, not secret. 
Dec 14 2013
9a2da2793576Shawn Davenport
Rails: Ignore the new home of secret_key_base. 
Dec 14 2013
402607d59360Daniel Niedergesäß
Update to Magento 1.8.x 
Dec 12 2013
54343272439bSteve Hulet
Remove duplicate rule 
Dec 10 2013
c65905abd2ccRichard Astbury
added node_modules 
Nov 29 2013
7b684c28663cAdam Roben
Merge pull request #785 from NickHodges/master 
Nov 27 2013
412d6907bcfdNick Hodges
Merging upstream 
Nov 27 2013
1c580917237bJens Jahnke
Explanations for ignoring the cache directory 
Nov 27 2013
a6dc172eaa6eAdam Roben
Merge pull request #879 from phmarek/master 
Nov 27 2013
1c7c01521a4fAdam Roben
Merge pull request #878 from minsOne/master 
Nov 27 2013
b81b5f92d7a1Adam Roben
Merge pull request #788 from sjwoodr/master 
Nov 27 2013
48b7b84b62d2Steve Woodruff
Java ME update for .mtj.tmp 
Nov 27 2013
277b8358f8c4Philipp Marek
Added file for Common Lisp. 
Nov 27 2013
e3fd04426861minsOne
Added ipa file to Objective-C.gitignore 
Nov 27 2013
513d1aab1f94Adam Roben
Merge pull request #876 from jmillerdesign/patch-2 
Nov 27 2013
413a9892b5e4J. Miller
Use absolute paths to the files to ignore 
Nov 27 2013
759bcc3e6246Adam Roben
Merge pull request #875 from four04/add-common-linux-compile-file-extensions 
Nov 27 2013
753c995244d9Adam Roben
Merge pull request #871 from mattrubin/master 
Nov 27 2013
c2c74647f25dAdam Roben
Merge pull request #869 from j4y/master 
Nov 27 2013
cbda8a4d7f2aAdam Roben
Merge pull request #870 from CaseyB/master 
Nov 27 2013
288442e18011Adam Roben
Merge pull request #866 from stefan-vatov/master 
Nov 27 2013
c76bbb50c05cKristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013
6604167da55fAdam Roben
Merge pull request #864 from oschrenk/patch-4 
Nov 27 2013
a79b082024c3Kristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013
43c205b5dfe4Adam Roben
Merge pull request #862 from jaseemabid/emacs 
Nov 27 2013
3fb1b419f204Adam Roben
Merge pull request #861 from jaseemabid/elisp 
Nov 27 2013
c8d99ff85725Kristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013