merge upstream/master
Description
Description
Details
Details
- Committed
Ivan Yatskevich <ivan@yatskevich.com> Nov 12 2013, 12:32 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNORE727777af2d65: Merge pull request #839 from jean/master
rGITIGNORE85a512a7ee97: add .idea_modules/ - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 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 | |||
| 02d84478d64f | Justin Spahr-Summers | Merge pull request #391 from mastacheata/patch-1 | Nov 12 2013 | |||
| 699a3ac68ac4 | Carl Suster | Fix a copy/paste mistake | Nov 12 2013 | |||
| 8646963bbac1 | Jean Jordaan | Merge branch 'master' of https://github.com/github/gitignore | Nov 12 2013 | |||
| 43de894452a5 | Jean Jordaan | Ignore multiple vim swapfiles | Nov 12 2013 | |||
| 1a3b885ef707 | Carl Suster | Merge pull request #700 from mquigley/master | Nov 12 2013 | |||
| 70aaa4d5042e | Carl Suster | Merge pull request #745 from tunitowen/master | Nov 12 2013 | |||
| 09793dd34e18 | Carl Suster | Merge pull request #473 from Visgean/master | Nov 12 2013 | |||
| 33b416dc000f | Visgean Skeloru | Update Python.gitignore | Nov 12 2013 | |||
| 97dcb890138e | Visgean Skeloru | #473 no need to have specific gitignore for django | Nov 12 2013 | |||
| e105d8c4b26e | Carl Suster | Merge pull request #838 from tiredpixel/ruby-slashes | Nov 11 2013 | |||
| ca456f73e42b | tiredpixel | Unslashify *.gem,*.rbc,.rvmrc . | Nov 11 2013 | |||
| 3b7ac85ad84a | tiredpixel | Slashify Ruby files and directories. | Nov 11 2013 | |||
| a1e656a09306 | Adam Roben | Merge pull request #443 from bungeshea/BricxCC | Nov 11 2013 | |||
| 9345b6b46138 | Shea Bunge | Add comment to BricxCC.gitignore | Nov 11 2013 | |||
| 8cbac43dabf9 | Shea Bunge | Move BricxCC.gitignore to Global directory | Nov 11 2013 | |||
| c928e22aab3a | Adam Roben | Merge pull request #837 from milas/master | Nov 11 2013 | |||
| 74b6dd15662b | Milas Bowman | Add Azure publish XML file | Nov 11 2013 | |||
| 52628ac48968 | Justin Spahr-Summers | Merge pull request #506 | Nov 11 2013 | |||
| 1a1de190aed7 | Justin Spahr-Summers | Merge remote-tracking branch 'origin/master' into pr/506 | Nov 11 2013 | |||
| 8335a5dad97d | Adam Roben | Merge pull request #615 from kristens/master | Nov 11 2013 | |||
| 0eb7703d1183 | Adam Roben | Merge pull request #582 from xnt/patch-1 | Nov 11 2013 | |||
| 81c11d90a399 | Adam Roben | Merge pull request #836 from jephir/fix-unity | Nov 11 2013 | |||
| 4469ba493892 | Jephir | Prevent Unity .gitignore from ignoring non-Unity project files | Nov 11 2013 | |||
| 768534c42f42 | Adam Roben | Merge pull request #834 from arcresu/ruby-version | Nov 11 2013 | |||
| e85ec2d82850 | Adam Roben | Merge pull request #488 from nanadevelopment/eeConfigAdd | Nov 11 2013 | |||
| 7bf906575042 | Adam Roben | Merge pull request #477 from neilkelty/master | Nov 11 2013 | |||
| 2fea1b6b925f | Adam Roben | Merge pull request #831 from arcresu/idea | Nov 11 2013 | |||
| 9463c86d9b3f | Adam Roben | Merge pull request #424 from MichaelMBishop/master | Nov 11 2013 | |||
| b5ff70798713 | Justin Spahr-Summers | Merge pull request #421 from matheussl/master | Nov 11 2013 | |||
| 669668fb14be | Carl Suster | Join comments in rails template | Nov 10 2013 | |||
| efd3490a54ae | Carl Suster | Tighten some ruby ignore patterns | Nov 10 2013 | |||
| 0ac2f7cb820b | Carl Suster | Optionally ignore ruby env normalisation files, with comments | Nov 10 2013 | |||
| d72190c56ad3 | Carl Suster | Merge pull request #833 from benmoss/master | Nov 10 2013 | |||
| f4e8e686d6a0 | Ben Moss | Leiningen by default creates a 'target' directory, not 'targets' | Nov 9 2013 | |||
| e0baa57b5850 | Carl Suster | Merge pull request #743 from hkdobrev/master | Nov 9 2013 | |||
| 3932f1f0ce7a | Haralan Dobrev | Add Composer.gitignore for composer packages | Nov 9 2013 | |||
| 4f659df36e63 | Carl Suster | Remove IntelliJ rules from Android -> Global/JetBrains | Nov 9 2013 | |||
| 35c6da6ea180 | Adam Roben | Merge pull request #832 from arcresu/latex | Nov 9 2013 | |||
| 81f8222e7fb5 | Carl Suster | Rename LaTeX->TeX | Nov 8 2013 | |||
| ce47378cc699 | Manuel Rauber/Carl Suster | Ignore .pyg files from LaTeX's minted package | Nov 8 2013 | |||
| 70fd1fd45cd6 | Carl Suster | Sort LaTeX auxiliary files by package | Nov 8 2013 | |||
| 40e48553fdf2 | Carl Suster | Merge pull request #828 from vvolkgang/patch-1 | Nov 8 2013 | |||
| 9ae01d0b642e | Carl Suster | Rename template IDEA->JetBrains | Nov 8 2013 | |||
| af886f72c894 | Carl Suster | Add back out/ for IntelliJ under IDEA | Nov 8 2013 |