Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions
Conflicts:
C.gitignore
Updates done.
Kristofer Rye <kristofer.rye@gmail.com> | Nov 27 2013, 04:31 |
aubort | Jul 2 2018, 16:12 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
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 | |||
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 | |||
52ec58209bd6 | Justin Spahr-Summers | Merge pull request #755 from ohmanger/patch-1 | Nov 13 2013 | |||
1b76d53beb8d | Justin Spahr-Summers | Merge pull request #738 from Blaisorblade/patch-1 | Nov 13 2013 | |||
3012b5656318 | Justin Spahr-Summers | Merge pull request #725 from shivam5992/patch-1 | Nov 13 2013 | |||
2d44869b4912 | Markus Olsson | Merge pull request #663 from abergs/patch-1 | Nov 12 2013 | |||
cbf090d44f9f | Justin Spahr-Summers | Merge pull request #682 from fsw/master | Nov 12 2013 | |||
e240feae833a | Justin Spahr-Summers | Merge pull request #657 from MrBogomips/master | Nov 12 2013 | |||
306ed4acf9ff | Justin Spahr-Summers | Merge pull request #655 from conradolega/master | Nov 12 2013 | |||
7e70ab946af3 | Adam Roben | Merge pull request #845 from gillesdemey/patch-1 | Nov 12 2013 | |||
25ec5b7c3e4b | Gilles De Mey | Update VisualStudio.gitignore | Nov 12 2013 | |||
ce72f3a03c1c | Adam Roben | Merge pull request #843 from vikraman/patch-1 | Nov 12 2013 | |||
40917a4d2f42 | Vikraman Choudhury/Vikraman | Ignore files generated by cabal sandbox | Nov 12 2013 | |||
8d71b3128c24 | Adam Roben | Merge pull request #844 from llonchj/python | Nov 12 2013 | |||
088535f046a7 | Jordi Llonch | Added Sphinx documentation | Nov 12 2013 | |||
df2de98c2522 | Adam Roben | Merge pull request #842 from borntyping/patch-1 | Nov 12 2013 | |||
b75c902dbb57 | Sam Clements/Sam Clements | Add .cache to the Python .gitignore | Nov 12 2013 | |||
af405251f003 | Adam Roben | Merge pull request #730 from Lazersmoke/patch-1 | Nov 12 2013 | |||
f7c1a9938e07 | Adam Roben | Merge pull request #683 from jkodumal/patch-1 | Nov 12 2013 | |||
de877c3e235a | Adam Roben | Merge pull request #681 from filipelenfers/master | Nov 12 2013 | |||
fc73773a747f | Adam Roben | Merge pull request #645 from pxqr/master | Nov 12 2013 | |||
55ccaf54bda0 | Adam Roben | Merge pull request #563 from fibo/master | Nov 12 2013 | |||
255977716590 | Adam Roben | Merge pull request #626 from borneq/patch-1 | Nov 12 2013 | |||
a69969b575ab | Adam Roben | Merge pull request #624 from finnjohnsen/patch-1 | Nov 12 2013 | |||
bfcd76a7863e | Adam Roben | Merge pull request #569 from AlainFolletete/master | Nov 12 2013 | |||
1e58a0c1100c | Adam Roben | Merge pull request #646 from manojlds/master | Nov 12 2013 | |||
a0570aeae85b | Adam Roben | Merge pull request #566 from fidelski/add-obvious-autotools-files | Nov 12 2013 | |||
d1ee264f9ed9 | Adam Roben | Merge pull request #586 from simonbuehler/master | Nov 12 2013 | |||
b04b8b24aabf | Adam Roben | Merge pull request #561 from stuartpb/cloud9 | Nov 12 2013 | |||
6bcd83ec33d3 | Adam Roben | Merge pull request #606 from bicycle-nerd/patch-1 | Nov 12 2013 | |||
4dd9d7376d5a | Adam Roben | Merge pull request #591 from mjgardner/master | Nov 12 2013 | |||
be029b7aebb5 | Adam Roben | Merge pull request #584 from zafarella/master | Nov 12 2013 | |||
47436efe923e | Adam Roben | Merge pull request #538 from hallco978/patch-1 | Nov 12 2013 | |||
f3503f42c63c | Carl Suster | Merge pull request #784 from yatskevich/master | Nov 12 2013 | |||
94a2b3b66857 | Ivan Yatskevich | add .idea_modules/ to Global/JetBrains.gitignore | Nov 12 2013 | |||
ba898ebefd7d | Ivan Yatskevich | merge upstream/master | Nov 12 2013 | |||
727777af2d65 | Carl Suster | Merge pull request #839 from jean/master | Nov 12 2013 | |||
a77f7f23fe17 | Jean Jordaan | Covered by global vim template | Nov 12 2013 | |||
41baaa27a677 | Carl Suster | Merge pull request #629 from ChinggizKhan/minor-drupal-gitignore-issue | Nov 12 2013 | |||
930f476c37ef | Jean Jordaan | Remove patterns covered by other templates | Nov 12 2013 | |||
b7982d496882 | Carl Suster | Merge pull request #688 from leek/patch-1 | Nov 12 2013 | |||
f37b54d58aac | Carl Suster | Merge pull request #597 from TomLiu/master | Nov 12 2013 |