Homec4science

Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node…

Authored by Adam Roben <adam@roben.org> on Feb 28 2014, 17:36.

Description

Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node-patch

Conflicts:
Node.gitignore

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
22f0d933d431Phil Haack
Merge pull request #969 from MisterJames/VisualStudioIgnore 
Feb 28 2014
69b99dd09119Carl Suster
Merge pull request #963 from tioui/eiffelstudio 
Feb 28 2014
121cbc3b7399Carl Suster
Merge pull request #945 from arcresu/sass-cache 
Feb 28 2014
4899dad9807dCarl Suster
Merge pull request #975 from DenJohX/patch-1 
Feb 28 2014
13c119f167adDennis Xiloj
Added ignore for directory config under KDE 
Feb 28 2014
fdc303bb722fCarl Suster
Merge pull request #973 from CodeBlock/idris 
Feb 28 2014
fef9e2d85d14Ricky Elrod
Add an Idris gitignore 
Feb 28 2014
cdfef4a8e13aCarl Suster
Merge pull request #970 from wzhishen/master 
Feb 28 2014
009b474870b4Louis M
Move the EiffelStudio.gitignore in the Global directory 
Feb 28 2014
8ff2f7af0f1fZhishen (Jason) Wen
Update Leiningen.gitignore 
Feb 28 2014
f68806d71988Carl Suster
Merge pull request #972 from CodeBlock/haskell-typo 
Feb 28 2014
3bb4e5118406Ricky Elrod
Fix typo in haskell gitignore 
Feb 28 2014
2992916925a0Carl Suster
Merge pull request #960 from SamWhited/patch-1 
Feb 28 2014
c8c4749b3fccCarl Suster
Merge pull request #964 from ohmanger/patch-1 
Feb 28 2014
5efebe2ef3adJames Chambers
Enable Ignore of NuGet Packages Folder By Default 
Feb 27 2014
d61f35aa62b1Mike Manger
Ignore log of applied patches 
Feb 25 2014
e5128246c5d6Louis M
Adding the EiffelStudio .gitingore file. 
Feb 24 2014
b83dd2fb1eb0Sam Whited
Ignore signed pom files in leiningen projects 
Feb 24 2014
553033ff2f89Carl Suster
Remove old sass-cache rule for Rails 
Feb 21 2014
503bde5d2493Carl Suster
Merge Sass and Compass templates 
Feb 21 2014
2544a6b71027Carl Suster
Merge pull request #954 from krtek/patch-1 
Feb 19 2014
7f7df0651892Lukáš Marek
Removed IDE support files entirely 
Feb 19 2014
073fd88f68f5Lukáš Marek
Removed JetBrains *.iws files 
Feb 19 2014
09e6aac9b560Brendan Forster
Merge pull request #923 from simnalamburt/patch-1 
Feb 18 2014
7d60eeeece54Hyeon Kim
Ignore the build result of ATL Project. 
Feb 18 2014
84a997704839Carl Suster
Merge pull request #948 from bbodenmiller/patch-1 
Feb 18 2014
8209ea1b3681Ben Bodenmiller
ignore SQL server database files 
Feb 14 2014
4bb37290cb55Markus Olsson
Merge pull request #947 from IonicaBizau/patch-1 
Feb 13 2014
12aa1b03fc44Ionică Bizău
Updated the year :-) 
Feb 13 2014
e0d819c2471dCarl Suster
Merge pull request #882 from Arvur/master 
Feb 13 2014
d51b1b71e9efDenis Grinyuk
Some cleanup 
Feb 13 2014
a9c7840df5ebCarl Suster
Merge pull request #942 from jturmel/master 
Feb 13 2014
9a0f32a452d0jturmel
Remove AndroidStudio, modify Global/JetBrains 
Feb 12 2014
432f6edf3876Denis Grinyuk
Additional comments 
Feb 12 2014
baf7fe56e687Denis Grinyuk
One more compiler-generated binary 
Feb 12 2014
7f275ff0ec40Denis Grinyuk
Some filetypes should be commented by default 
Feb 12 2014
33540b975592Denis Grinyuk
Nicer Delphi .gitignore 
Feb 12 2014
f85e67659dd4Denis Grinyuk
This is not Delphi-specific folder 
Feb 12 2014
52eec8d55870jturmel
Add AndroidStudio gitignore file 
Feb 10 2014
03c0beb0805fCarl Suster
Merge pull request #930 from Lordovos/dmlang 
Feb 10 2014
bf40264de8eaAdam Roben
Merge pull request #920 from danlister/patch-1 
Feb 7 2014
1389bf1b2629Dan Lister
Removed Visual Studio ignore rules from umbraco.gitignore 
Feb 7 2014
90d31abaeaa1Carl Suster
Merge pull request #941 from edelbluth/master 
Feb 6 2014
c0f0ef9a2ed9Adam Roben
Merge pull request #940 from cemmersb/patch-1 
Feb 6 2014
2c5f5cbedb60Adam Roben
Merge pull request #927 from Bananeweizen/patch-1 
Feb 6 2014
911a86bb45d2Adam Roben
Merge pull request #926 from cknoblauch/patch-1 
Feb 6 2014
f35df2526ccdAdam Roben
Merge pull request #895 from EvandroLG/patch-1 
Feb 6 2014
84aef6a31950Juergen Edelbluth
Added *.synctex.gz(busy) 
Feb 6 2014
38cbefd1c47cChristoph Emmersberger
Update JetBrains.gitignore 
Feb 6 2014
e8982c5fe4c3Carl Suster
Merge pull request #937 from ahmyi/patch-1 
Feb 6 2014