Homec4science

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

Authored by Daniel Bailey <danieljabailey@gmail.com> on Nov 13 2013, 19:32.

Description

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

Event Timeline

Daniel Bailey <danieljabailey@gmail.com> committed rGITIGNOREb10fa9c7d63b: Merge branch 'master' of https://github.com/github/gitignore (authored by Daniel Bailey <danieljabailey@gmail.com>).Nov 13 2013, 19:32

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
52ec58209bd6Justin Spahr-Summers
Merge pull request #755 from ohmanger/patch-1 
Nov 13 2013
1b76d53beb8dJustin Spahr-Summers
Merge pull request #738 from Blaisorblade/patch-1 
Nov 13 2013
3012b5656318Justin Spahr-Summers
Merge pull request #725 from shivam5992/patch-1 
Nov 13 2013
2d44869b4912Markus Olsson
Merge pull request #663 from abergs/patch-1 
Nov 12 2013
cbf090d44f9fJustin Spahr-Summers
Merge pull request #682 from fsw/master 
Nov 12 2013
e240feae833aJustin Spahr-Summers
Merge pull request #657 from MrBogomips/master 
Nov 12 2013
306ed4acf9ffJustin Spahr-Summers
Merge pull request #655 from conradolega/master 
Nov 12 2013
7e70ab946af3Adam Roben
Merge pull request #845 from gillesdemey/patch-1 
Nov 12 2013
25ec5b7c3e4bGilles De Mey
Update VisualStudio.gitignore 
Nov 12 2013
ce72f3a03c1cAdam Roben
Merge pull request #843 from vikraman/patch-1 
Nov 12 2013
40917a4d2f42Vikraman Choudhury/Vikraman
Ignore files generated by cabal sandbox 
Nov 12 2013
8d71b3128c24Adam Roben
Merge pull request #844 from llonchj/python 
Nov 12 2013
088535f046a7Jordi Llonch
Added Sphinx documentation 
Nov 12 2013
df2de98c2522Adam Roben
Merge pull request #842 from borntyping/patch-1 
Nov 12 2013
b75c902dbb57Sam Clements/Sam Clements
Add .cache to the Python .gitignore 
Nov 12 2013
af405251f003Adam Roben
Merge pull request #730 from Lazersmoke/patch-1 
Nov 12 2013
f7c1a9938e07Adam Roben
Merge pull request #683 from jkodumal/patch-1 
Nov 12 2013
de877c3e235aAdam Roben
Merge pull request #681 from filipelenfers/master 
Nov 12 2013
fc73773a747fAdam Roben
Merge pull request #645 from pxqr/master 
Nov 12 2013
55ccaf54bda0Adam Roben
Merge pull request #563 from fibo/master 
Nov 12 2013
255977716590Adam Roben
Merge pull request #626 from borneq/patch-1 
Nov 12 2013
a69969b575abAdam Roben
Merge pull request #624 from finnjohnsen/patch-1 
Nov 12 2013
bfcd76a7863eAdam Roben
Merge pull request #569 from AlainFolletete/master 
Nov 12 2013
1e58a0c1100cAdam Roben
Merge pull request #646 from manojlds/master 
Nov 12 2013
a0570aeae85bAdam Roben
Merge pull request #566 from fidelski/add-obvious-autotools-files 
Nov 12 2013
d1ee264f9ed9Adam Roben
Merge pull request #586 from simonbuehler/master 
Nov 12 2013
b04b8b24aabfAdam Roben
Merge pull request #561 from stuartpb/cloud9 
Nov 12 2013
6bcd83ec33d3Adam Roben
Merge pull request #606 from bicycle-nerd/patch-1 
Nov 12 2013
4dd9d7376d5aAdam Roben
Merge pull request #591 from mjgardner/master 
Nov 12 2013
be029b7aebb5Adam Roben
Merge pull request #584 from zafarella/master 
Nov 12 2013
47436efe923eAdam Roben
Merge pull request #538 from hallco978/patch-1 
Nov 12 2013
f3503f42c63cCarl Suster
Merge pull request #784 from yatskevich/master 
Nov 12 2013
94a2b3b66857Ivan Yatskevich
add .idea_modules/ to Global/JetBrains.gitignore 
Nov 12 2013
ba898ebefd7dIvan Yatskevich
merge upstream/master 
Nov 12 2013
727777af2d65Carl Suster
Merge pull request #839 from jean/master 
Nov 12 2013
a77f7f23fe17Jean Jordaan
Covered by global vim template 
Nov 12 2013
41baaa27a677Carl Suster
Merge pull request #629 from ChinggizKhan/minor-drupal-gitignore-issue 
Nov 12 2013
930f476c37efJean Jordaan
Remove patterns covered by other templates 
Nov 12 2013
b7982d496882Carl Suster
Merge pull request #688 from leek/patch-1 
Nov 12 2013
f37b54d58aacCarl Suster
Merge pull request #597 from TomLiu/master 
Nov 12 2013
02d84478d64fJustin Spahr-Summers
Merge pull request #391 from mastacheata/patch-1 
Nov 12 2013
699a3ac68ac4Carl Suster
Fix a copy/paste mistake 
Nov 12 2013
8646963bbac1Jean Jordaan
Merge branch 'master' of https://github.com/github/gitignore 
Nov 12 2013
43de894452a5Jean Jordaan
Ignore multiple vim swapfiles 
Nov 12 2013
1a3b885ef707Carl Suster
Merge pull request #700 from mquigley/master 
Nov 12 2013
70aaa4d5042eCarl Suster
Merge pull request #745 from tunitowen/master 
Nov 12 2013
09793dd34e18Carl Suster
Merge pull request #473 from Visgean/master 
Nov 12 2013
33b416dc000fVisgean Skeloru
Update Python.gitignore 
Nov 12 2013
97dcb890138eVisgean Skeloru
#473 no need to have specific gitignore for django 
Nov 12 2013
e105d8c4b26eCarl Suster
Merge pull request #838 from tiredpixel/ruby-slashes 
Nov 11 2013