Jonathan Chu
6ac648f033
Merge remote-tracking branch 'upstream/master'
2016-02-11 22:03:05 -05:00
Brendan Forster
3a529da68a
Merge pull request #1856 from mcandre/gradle-intellij-workaround
...
work around intellij gradle wrapper refreshing bug
2016-02-12 07:57:58 +11:00
Andrew Pennebaker
cf46e139ad
work around intellij gradle wrapper refreshing bug
2016-02-11 14:21:19 -06:00
Brendan Forster
ce62a06810
Merge pull request #1854 from RobertoNovelo/master
...
Added Library Mappings and VCS Root
2016-02-11 09:20:52 +11:00
Roberto Novelo
436959591a
Merge pull request #1 from RobertoNovelo/enhancement-jetbrains-gitignore
...
Added Library Mappings and VCS Root
2016-02-10 12:46:24 -06:00
Roberto Novelo
cd222dfc62
Added Library Mappings and VCS Root
...
These files differ on Windows and OS X.
2016-02-10 12:45:16 -06:00
Zenuka
a23bb4a523
Update VisualStudio.gitignore
...
Added bower_components to .gitignore
2016-02-10 16:38:54 +01:00
Brendan Forster
9ff1a19de8
Merge pull request #1846 from mcandre/octave-session-info
...
matlab: ignore octave session info
2016-02-10 13:20:57 +10:30
Brendan Forster
f4e1169a0d
Merge pull request #1848 from austinjalexander/patch-1
...
fix style in Python.gitignore by adding space after #
2016-02-09 08:57:59 +10:30
Brendan Forster
d6f33de188
Merge pull request #1847 from nloveladyallen/patch-1
...
Remove redundancy in Global/Vim.gitignore
2016-02-09 08:57:42 +10:30
Austin J. Alexander
bcbbc6eae2
fix style by adding space after #
2016-02-07 13:08:03 -05:00
Noah Lovelady-Allen
31045e29f8
Remove redundancy in Global/Vim.gitignore
...
Anything matched by `*.un~` will also be matched by the last rule, `*~`.
2016-02-07 08:57:08 -05:00
Andrew Pennebaker
98a3ab7719
matlab: ignore octave session info
2016-02-06 02:51:00 -06:00
Brendan Forster
7e04a3f05c
Merge pull request #1844 from icylogic/Patch-Eagle
...
update Eagle.gitignore for .lck
2016-02-05 08:03:41 +10:30
icylogic
31c960a5ca
update Eagle.gitignore for .lck
2016-02-03 21:51:15 +08:00
Brendan Forster
87bd07e50d
Merge pull request #1843 from jutoft/master
...
Add ignore for .lox files from fixme package
2016-02-03 22:17:57 +10:30
Jesper Utoft
03e1898c93
Add ignore for .lox files from fixme package
2016-02-03 11:42:49 +01:00
Brendan Forster
fa441f9031
Merge pull request #1791 from Oddj0b/Calabash
...
Based on a template from jmoody
2016-01-28 15:58:45 +10:30
Brendan Forster
915a98c838
Merge pull request #1615 from maieul/reledmac_endnote
...
reledmac use one individual file by series of endnotes :
2016-01-28 15:58:21 +10:30
Brendan Forster
276cc5877f
Merge pull request #1801 from vltr/patch-1
...
Update Python.gitignore
2016-01-28 09:23:13 +10:30
Richard Kuesters
71bbd933ee
merging Python.gitignore for PR #1801
2016-01-27 20:46:49 -02:00
Brendan Forster
c40da92078
Merge pull request #1593 from jcarsique/master
...
Add Code Recommenders directory
2016-01-28 09:00:46 +10:30
Julien Carsique
71e0c804e6
Add Code Recommenders directory
...
Code Recommenders introduced in Eclipse Luna (4.5) creates a .recommenders directory at the root of the workspace, like .metadata
2016-01-27 23:25:49 +01:00
Villars Gimm
8ec50f4b74
Move Calabash to Global
2016-01-27 12:24:30 +01:00
Maïeul Rouquette
bfabdf1948
Merge branch 'master' into reledmac_endnote
2016-01-27 10:07:13 +01:00
Brendan Forster
a25a0191d9
Merge pull request #1475 from LazarusX/master
...
Update JetBrains.gitignore according to the official knowledge base article
2016-01-27 18:11:14 +10:30
Ray Fang
edb522ba0b
Update reference article link
2016-01-27 14:41:47 +08:00
Ray Fang
42110464c9
Merge upstream changes
2016-01-27 14:36:41 +08:00
Brendan Forster
495ce0e4fb
Merge pull request #1633 from jnycz/patch-1
...
Incorrect file path
2016-01-27 16:14:06 +10:30
Brendan Forster
80c4cbc532
Merge pull request #1609 from habi/patch-1
...
Adding more files to ignore when using minitoc
2016-01-27 16:07:34 +10:30
Brendan Forster
1199897c60
Merge pull request #1631 from ahmedbaracat/patch-1
...
Allow for ignoring other important files and save space
2016-01-27 16:04:49 +10:30
Brendan Forster
f599ca2f15
Merge pull request #1607 from kc9jud/patch-1
...
Update Eagle.gitignore
2016-01-27 16:01:18 +10:30
Brendan Forster
352c903c34
Merge pull request #1546 from Coeur/patch-1
...
DerivedData and xcuserdata are folders; *.xcuserstate is always inside
2016-01-27 15:27:31 +10:30
Brendan Forster
8ae0b3e125
Merge pull request #1542 from barraponto/patch-1
...
Document Vim file patterns
2016-01-27 15:23:45 +10:30
Brendan Forster
4b2af6fb77
Merge pull request #1387 from tyutyutyu/patch-1
...
Add Tern plugin to Eclipse.gitignore
2016-01-27 13:54:18 +10:30
Brendan Forster
a52383453b
Merge pull request #1683 from edsondota/master
...
Add local_settings to Django's ignore
2016-01-27 13:34:36 +10:30
Brendan Forster
504f54caf8
Merge pull request #1415 from wisitsaks/patch-1
...
Update VisualStudio.gitignore
2016-01-27 13:11:02 +10:30
Brendan Forster
805aee54f1
Merge pull request #1836 from jderobot-varribas/Qt/ignore-cmakelists.txt.user
...
Qt: ignore CMakeLists.txt.user
2016-01-27 05:17:44 +10:30
Victor Arribas
2c3b06b1ec
Qt: ignore CMakeLists.txt.user
2016-01-25 18:50:35 +01:00
Brendan Forster
9f3470db3b
Merge pull request #1833 from hzor3000/patch-1
...
Add *.VC.opendb for UnrealEngine
2016-01-24 14:08:28 +10:30
Brendan Forster
96ad0e39a5
Merge pull request #1835 from pisaacs/patch-1
...
Add .byebug_history to gitignore
2016-01-24 07:29:17 +10:30
pisaacs
9c92fa360f
Add .byebug_history to gitignore
...
.byebug_history included in default Rails5 setup (https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/templates/gitignore )
2016-01-23 12:56:49 -05:00
Vahagn Harutyunyan
514f24b99a
Add *.VC.opendb for UnrealEngine
...
Add *.VC.opendb to the .gitignore for the UnrealEngine for Visual Studio 2015 Update 1 users. This reflects the changes in the VisualStudio.gitignore made in https://github.com/github/gitignore/pull/1778 and https://github.com/github/gitignore/pull/1783 but is more specifically targeted at solving the issue http://stackoverflow.com/questions/34319008/git-issue-with-visual-studio-2015-update-1 .
2016-01-23 14:44:18 +04:00
Brendan Forster
c7557c59a5
Merge pull request #1831 from chwarr/emacs-server-auth-dir
...
Ignore default Emacs server auth dir
2016-01-23 10:09:46 +10:30
Christopher Warrington
9771968355
Ignore default Emacs server auth dir
...
The server-auth-dir is where Emacs stores authentication files for Emacs
servers (running over TCP). These are (usually) ephemeral in nature, and
should be ignored.
2016-01-22 14:57:28 -08:00
Brendan Forster
45ce044e6f
Merge pull request #1340 from msikma/patch-1
...
Ignore .venv files created by auto-activation scripts
2016-01-21 20:46:34 +10:30
Michiel Sikma
29bd7031a7
Merge remote-tracking branch 'upstream/master' into patch-1
2016-01-21 10:36:01 +01:00
Brendan Forster
dd83dbdf60
Merge branch 'master' into update-license
2016-01-18 11:00:05 +11:00
Garen Torikian
e4c0ed3c20
Merge pull request #1826 from pra85/patch-1
...
Update license year to 2016
2016-01-17 11:01:58 -08:00
Garen Torikian
df37ae670c
Merge pull request #1827 from DerNivel/patch-1
...
Update Node.gitignore
2016-01-17 11:01:42 -08:00