From c9200696fb2325d82c7816cc5b6d1e77a90036b0 Mon Sep 17 00:00:00 2001 From: Michiel Sikma Date: Mon, 29 Dec 2014 15:16:25 +0100 Subject: Update VirtualEnv.gitignore Ignore .venv files created by virtualenvwrapper and virtualfish for auto-activation purposes. --- Global/VirtualEnv.gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'Global') diff --git a/Global/VirtualEnv.gitignore b/Global/VirtualEnv.gitignore index 3fab25b5..043786df 100644 --- a/Global/VirtualEnv.gitignore +++ b/Global/VirtualEnv.gitignore @@ -6,3 +6,4 @@ [Ll]ib [Ss]cripts pyvenv.cfg +.venv -- cgit v1.2.3 From 0bb759363f51b53363666ae620e171bbf6a738c3 Mon Sep 17 00:00:00 2001 From: István Földházi Date: Thu, 29 Jan 2015 14:11:33 +0100 Subject: Add Tern plugin to Eclipse.gitignore The Tern plugin generate a '.tern-project' file in the project directory. (https://github.com/angelozerr/tern.java/wiki/Tern-Eclipse-IDE) --- Global/Eclipse.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index 81e44304..29d619b0 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -32,5 +32,8 @@ local.properties # sbteclipse plugin .target +# Tern plugin +.tern-project + # TeXlipse plugin .texlipse -- cgit v1.2.3 From b75ce44424559da6c72e359f6bc13bad815b8731 Mon Sep 17 00:00:00 2001 From: Ray Fang Date: Tue, 14 Apr 2015 21:44:20 +0800 Subject: Update JetBrains.gitignore according to the knowledge base article --- Global/JetBrains.gitignore | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'Global') diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index dff645a0..6b3ea2a7 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,32 +1,26 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm - -*.iml - -## Directory-based project format: -.idea/ -# if you remove the above rule, at least ignore the following: +# Reference https://intellij-support.jetbrains.com/entries/23393067 # User-specific stuff: -# .idea/workspace.xml -# .idea/tasks.xml -# .idea/dictionaries +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries # Sensitive or high-churn files: -# .idea/dataSources.ids -# .idea/dataSources.xml -# .idea/sqlDataSources.xml -# .idea/dynamic.xml -# .idea/uiDesigner.xml +.idea/dataSources.ids +.idea/dataSources.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml # Gradle: -# .idea/gradle.xml -# .idea/libraries +.idea/gradle.xml +.idea/libraries # Mongo Explorer plugin: -# .idea/mongoSettings.xml +.idea/mongoSettings.xml ## File-based project format: -*.ipr *.iws ## Plugin-specific files: -- cgit v1.2.3 From 457f6464a77881e0408269686dd0698c3b90a98e Mon Sep 17 00:00:00 2001 From: Capi Etheriel Date: Fri, 5 Jun 2015 12:35:49 -0300 Subject: document Vim file patterns --- Global/Vim.gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Global') diff --git a/Global/Vim.gitignore b/Global/Vim.gitignore index 6c5ee8df..325bd576 100644 --- a/Global/Vim.gitignore +++ b/Global/Vim.gitignore @@ -1,6 +1,10 @@ +# swap [._]*.s[a-w][a-z] [._]s[a-w][a-z] +# persistent undo *.un~ +# session Session.vim +# temporary .netrwhist *~ -- cgit v1.2.3 From f85cff8fbeb8bf07dd1217722a617d947160f556 Mon Sep 17 00:00:00 2001 From: Antoine Cœur Date: Mon, 8 Jun 2015 12:15:40 +0200 Subject: DerivedData and xcuserdata are folders; *.xcuserstate is always inside xcuserdata folder --- Global/Xcode.gitignore | 5 ++--- Objective-C.gitignore | 5 ++--- Swift.gitignore | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'Global') diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index d07b7894..c08bace2 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -4,7 +4,7 @@ ## Build generated build/ -DerivedData +DerivedData/ ## Various settings *.pbxuser @@ -15,9 +15,8 @@ DerivedData !default.mode2v3 *.perspectivev3 !default.perspectivev3 -xcuserdata +xcuserdata/ ## Other *.xccheckout *.moved-aside -*.xcuserstate diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 7f24b4de..59f6862a 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -4,7 +4,7 @@ ## Build generated build/ -DerivedData +DerivedData/ ## Various settings *.pbxuser @@ -15,12 +15,11 @@ DerivedData !default.mode2v3 *.perspectivev3 !default.perspectivev3 -xcuserdata +xcuserdata/ ## Other *.xccheckout *.moved-aside -*.xcuserstate ## Obj-C/Swift specific *.hmap diff --git a/Swift.gitignore b/Swift.gitignore index 583de456..e278bf19 100644 --- a/Swift.gitignore +++ b/Swift.gitignore @@ -4,7 +4,7 @@ ## Build generated build/ -DerivedData +DerivedData/ ## Various settings *.pbxuser @@ -15,12 +15,11 @@ DerivedData !default.mode2v3 *.perspectivev3 !default.perspectivev3 -xcuserdata +xcuserdata/ ## Other *.xccheckout *.moved-aside -*.xcuserstate ## Obj-C/Swift specific *.hmap -- cgit v1.2.3 From 7e09dc6a4e57c161211417d78d63e6db78b5fb59 Mon Sep 17 00:00:00 2001 From: Fabian Raab Date: Mon, 24 Aug 2015 18:02:05 +0200 Subject: add .fuse_hidden* to Linux --- Global/Linux.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore index 5932ea17..f709203d 100644 --- a/Global/Linux.gitignore +++ b/Global/Linux.gitignore @@ -1,5 +1,8 @@ *~ +# temporary files which can be created if a process still has a deleted file handle open +.fuse_hidden* + # KDE directory preferences .directory -- cgit v1.2.3 From 7ea5e704a4ffff2a883f326f0323eeba44b81da5 Mon Sep 17 00:00:00 2001 From: Fabian Raab Date: Mon, 24 Aug 2015 18:12:34 +0200 Subject: improve description of .fuse_hidden --- Global/Linux.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Global') diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore index f709203d..cc958689 100644 --- a/Global/Linux.gitignore +++ b/Global/Linux.gitignore @@ -1,6 +1,6 @@ *~ -# temporary files which can be created if a process still has a deleted file handle open +# temporary files which can be created if a process still has a handle open of a deleted file .fuse_hidden* # KDE directory preferences -- cgit v1.2.3 From 9978001b13ad08bc2e67dafcc2ac66fa714762f6 Mon Sep 17 00:00:00 2001 From: Paolo Fulgoni Date: Fri, 11 Sep 2015 17:16:42 +0200 Subject: Add rule for MS PowerPoint temporary files --- Global/MicrosoftOffice.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/MicrosoftOffice.gitignore b/Global/MicrosoftOffice.gitignore index 412297bb..4a2edc7e 100644 --- a/Global/MicrosoftOffice.gitignore +++ b/Global/MicrosoftOffice.gitignore @@ -8,3 +8,6 @@ # Excel Backup File *.xlk + +# PowerPoint temporary +~$*.ppt* -- cgit v1.2.3 From 38d6cac990a82a1f7814571634e08295086763b5 Mon Sep 17 00:00:00 2001 From: Thomas Steinholz Date: Thu, 29 Oct 2015 17:24:45 -0400 Subject: Update JetBrains.gitignore Added a forgotten IDE to the .gitignore documentation. Why? For completeness and correctness What? [Webstorm](https://www.jetbrains.com/webstorm). --- Global/JetBrains.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Global') diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 177bc80b..5d2e327f 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,4 +1,4 @@ -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm *.iml -- cgit v1.2.3 From 3885bb94a726bf6386a0bad663e11ee256e22367 Mon Sep 17 00:00:00 2001 From: István Földházi Date: Tue, 3 Nov 2015 11:59:53 +0100 Subject: Update Eclipse.gitignore Add ignore for STS's .springBeans file --- Global/Eclipse.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index 0e22e957..880dd928 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -37,3 +37,6 @@ local.properties # TeXlipse plugin .texlipse + +# STS (Spring Tool Suite) +.springBeans -- cgit v1.2.3 From f0daa85888e8692f3b3ba08383e1dfb155304690 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Thu, 5 Nov 2015 08:01:15 -0800 Subject: NetBeans file nb-configuration.xml should not be ignored. --- Global/NetBeans.gitignore | 1 - 1 file changed, 1 deletion(-) (limited to 'Global') diff --git a/Global/NetBeans.gitignore b/Global/NetBeans.gitignore index debe0e48..520d91ff 100644 --- a/Global/NetBeans.gitignore +++ b/Global/NetBeans.gitignore @@ -4,5 +4,4 @@ nbbuild/ dist/ nbdist/ nbactions.xml -nb-configuration.xml .nb-gradle/ -- cgit v1.2.3 From 84010e499fef0b61d4f3cb29a31138b47837797f Mon Sep 17 00:00:00 2001 From: chenyufeng <503434355@qq.com> Date: Mon, 9 Nov 2015 10:51:42 +0800 Subject: add *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and Swift.gitignore --- Global/Xcode.gitignore | 1 + Objective-C.gitignore | 1 + Swift.gitignore | 1 + 3 files changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index d07b7894..738468cc 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -21,3 +21,4 @@ xcuserdata *.xccheckout *.moved-aside *.xcuserstate +*.xcscheme diff --git a/Objective-C.gitignore b/Objective-C.gitignore index b15babe7..8001e5ba 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -22,6 +22,7 @@ xcuserdata *.moved-aside *.xcuserstate *.xcscmblueprint +*.xcscheme ## Obj-C/Swift specific *.hmap diff --git a/Swift.gitignore b/Swift.gitignore index b15babe7..8001e5ba 100644 --- a/Swift.gitignore +++ b/Swift.gitignore @@ -22,6 +22,7 @@ xcuserdata *.moved-aside *.xcuserstate *.xcscmblueprint +*.xcscheme ## Obj-C/Swift specific *.hmap -- cgit v1.2.3 From 97dc1fdfc3be743f402dd4a965909f85bc2447d0 Mon Sep 17 00:00:00 2001 From: Nick Brook Date: Thu, 19 Nov 2015 00:24:34 +0000 Subject: Remove *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and Swift.gitignore --- Global/Xcode.gitignore | 1 - Objective-C.gitignore | 1 - Swift.gitignore | 1 - 3 files changed, 3 deletions(-) (limited to 'Global') diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 738468cc..d07b7894 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -21,4 +21,3 @@ xcuserdata *.xccheckout *.moved-aside *.xcuserstate -*.xcscheme diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 4ccb4368..79d9331b 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -22,7 +22,6 @@ xcuserdata *.moved-aside *.xcuserstate *.xcscmblueprint -*.xcscheme ## Obj-C/Swift specific *.hmap diff --git a/Swift.gitignore b/Swift.gitignore index 4ccb4368..79d9331b 100644 --- a/Swift.gitignore +++ b/Swift.gitignore @@ -22,7 +22,6 @@ xcuserdata *.moved-aside *.xcuserstate *.xcscmblueprint -*.xcscheme ## Obj-C/Swift specific *.hmap -- cgit v1.2.3 From bf845507564bfc38943730c11da8b05bf6033d9e Mon Sep 17 00:00:00 2001 From: Stephen Date: Sun, 6 Dec 2015 11:47:00 -0800 Subject: Update to include iMPACT and Core Generator files --- Global/XilinxISE.gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Global') diff --git a/Global/XilinxISE.gitignore b/Global/XilinxISE.gitignore index e041f51b..4475f843 100644 --- a/Global/XilinxISE.gitignore +++ b/Global/XilinxISE.gitignore @@ -42,6 +42,16 @@ *_usage.xml *_xst.xrpt +# iMPACT generated files +_impactbatch.log +impact.xsl +impact_impact.xwbt +ise_impact.cmd +webtalk_impact.xml + +# Core Generator generated files +xaw2verilog.log + # project-wide generated files *.gise par_usage_statistics.html -- cgit v1.2.3 From f5784d7a10fe288a80066f60cf4a5efa280faca8 Mon Sep 17 00:00:00 2001 From: Justas Brazauskas Date: Sun, 13 Dec 2015 16:07:46 +0200 Subject: Fix few typos --- Global/EiffelStudio.gitignore | 2 +- Rails.gitignore | 4 ++-- Ruby.gitignore | 2 +- Typo3.gitignore | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Global') diff --git a/Global/EiffelStudio.gitignore b/Global/EiffelStudio.gitignore index a7ba35f8..f41b4f70 100644 --- a/Global/EiffelStudio.gitignore +++ b/Global/EiffelStudio.gitignore @@ -1,2 +1,2 @@ -# The compilation directoy +# The compilation directory EIFGENs diff --git a/Rails.gitignore b/Rails.gitignore index f786a90a..55fcde6c 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -16,11 +16,11 @@ pickle-email-*.html config/initializers/secret_token.rb config/secrets.yml -## Environment normalisation: +## Environment normalization: /.bundle /vendor/bundle -# these should all be checked in to normalise the environment: +# these should all be checked in to normalize the environment: # Gemfile.lock, .ruby-version, .ruby-gemset # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: diff --git a/Ruby.gitignore b/Ruby.gitignore index 1ba91c05..a8b1cda2 100644 --- a/Ruby.gitignore +++ b/Ruby.gitignore @@ -21,7 +21,7 @@ build/ /doc/ /rdoc/ -## Environment normalisation: +## Environment normalization: /.bundle/ /vendor/bundle /lib/bundler/man/ diff --git a/Typo3.gitignore b/Typo3.gitignore index 5781fcc3..cb024fef 100644 --- a/Typo3.gitignore +++ b/Typo3.gitignore @@ -1,5 +1,5 @@ ## TYPO3 v6.2 -# Ignore serveral upload and file directories. +# Ignore several upload and file directories. /fileadmin/user_upload/ /fileadmin/_temp_/ /fileadmin/_processed_/ -- cgit v1.2.3 From 5fa2ff234591ddae5a79d183a67492d67773ff86 Mon Sep 17 00:00:00 2001 From: Dmitry Rosolko Date: Thu, 31 Dec 2015 12:40:20 +0300 Subject: Update Eclipse.gitignore Remove .gradle because it is not eclipse specific and already added in Gradle.gitignore. --- Global/Eclipse.gitignore | 1 - 1 file changed, 1 deletion(-) (limited to 'Global') diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index 880dd928..fcafca5d 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -1,6 +1,5 @@ *.pydevproject .metadata -.gradle bin/ tmp/ *.tmp -- cgit v1.2.3 From efab0fd13c8bcd0dc1bb43063b5647a98496b044 Mon Sep 17 00:00:00 2001 From: James Elford Date: Sun, 10 Jan 2016 09:01:17 +0000 Subject: Include lib64 for virtualenv On systems that require a lib64, virtualenv creates a symlink to the local lib. --- Global/VirtualEnv.gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'Global') diff --git a/Global/VirtualEnv.gitignore b/Global/VirtualEnv.gitignore index 831cf3af..3259f81e 100644 --- a/Global/VirtualEnv.gitignore +++ b/Global/VirtualEnv.gitignore @@ -4,6 +4,7 @@ [Bb]in [Ii]nclude [Ll]ib +[Ll]ib64 [Ll]ocal [Ss]cripts pyvenv.cfg -- cgit v1.2.3 From 491eca8bda234da47c8dcf32770ba8067e233822 Mon Sep 17 00:00:00 2001 From: mimibar Date: Wed, 13 Jan 2016 13:00:10 -0600 Subject: Comments Just added some comments. Some of us don't need some of the lines in the file. --- Global/Eclipse.gitignore | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Global') diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index fcafca5d..6229f7cf 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -1,4 +1,4 @@ -*.pydevproject + .metadata bin/ tmp/ @@ -19,7 +19,10 @@ local.properties # Locally stored "Eclipse launch configurations" *.launch -# CDT-specific +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) .cproject # JDT-specific (Eclipse Java Development Tools) @@ -28,7 +31,7 @@ local.properties # Java annotation processor (APT) .factorypath -# PDT-specific +# PDT-specific (PHP Development Tools) .buildpath # sbteclipse plugin -- cgit v1.2.3 From 9771968355d9ff605ed75054996f4bf1bf9c62d4 Mon Sep 17 00:00:00 2001 From: Christopher Warrington Date: Fri, 22 Jan 2016 14:57:28 -0800 Subject: 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. --- Global/Emacs.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore index e5327bad..95e09eba 100644 --- a/Global/Emacs.gitignore +++ b/Global/Emacs.gitignore @@ -30,3 +30,6 @@ tramp # cask packages .cask/ + +# server auth directory +/server/ -- cgit v1.2.3 From edb522ba0b1897434764968ce7698ba39119dd2a Mon Sep 17 00:00:00 2001 From: Ray Fang Date: Wed, 27 Jan 2016 14:41:47 +0800 Subject: Update reference article link --- Global/JetBrains.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Global') diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 2947063e..e845b237 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,5 +1,5 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference https://intellij-support.jetbrains.com/entries/23393067 +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff: .idea/workspace.xml -- cgit v1.2.3 From 8ec50f4b7448d90578e28f34632070da7b7935cf Mon Sep 17 00:00:00 2001 From: Villars Gimm Date: Wed, 27 Jan 2016 12:24:30 +0100 Subject: Move Calabash to Global --- Calabash.gitignore | 10 ---------- Global/Calabash.gitignore | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 Calabash.gitignore create mode 100644 Global/Calabash.gitignore (limited to 'Global') diff --git a/Calabash.gitignore b/Calabash.gitignore deleted file mode 100644 index 8a75b329..00000000 --- a/Calabash.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# Calabash / Cucumber -rerun/ -reports/ -screenshots/ -screenshot*.png -test-servers/ - -# bundler -.bundle -vendor diff --git a/Global/Calabash.gitignore b/Global/Calabash.gitignore new file mode 100644 index 00000000..8a75b329 --- /dev/null +++ b/Global/Calabash.gitignore @@ -0,0 +1,10 @@ +# Calabash / Cucumber +rerun/ +reports/ +screenshots/ +screenshot*.png +test-servers/ + +# bundler +.bundle +vendor -- cgit v1.2.3 From 71e0c804e6698818a661af9e1e03845a95ad3dbe Mon Sep 17 00:00:00 2001 From: Julien Carsique Date: Thu, 16 Jul 2015 14:19:00 +0200 Subject: Add Code Recommenders directory Code Recommenders introduced in Eclipse Luna (4.5) creates a .recommenders directory at the root of the workspace, like .metadata --- Global/Eclipse.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index 29a336c2..53236b63 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -45,3 +45,6 @@ local.properties # STS (Spring Tool Suite) .springBeans + +# Code Recommenders +.recommenders/ -- cgit v1.2.3 From 98a3ab7719edd27d4c86af3daa1fdf883bb2e114 Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Sat, 6 Feb 2016 02:51:00 -0600 Subject: matlab: ignore octave session info --- Global/Matlab.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Global') diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore index 79bc56cd..32a5ad4c 100644 --- a/Global/Matlab.gitignore +++ b/Global/Matlab.gitignore @@ -14,3 +14,6 @@ # Simulink Code Generation slprj/ + +# Session info +octave-workspace -- cgit v1.2.3 From 31045e29f8d6d8103262a096e145b6085f4336ea Mon Sep 17 00:00:00 2001 From: Noah Lovelady-Allen Date: Sun, 7 Feb 2016 08:57:08 -0500 Subject: Remove redundancy in Global/Vim.gitignore Anything matched by `*.un~` will also be matched by the last rule, `*~`. --- Global/Vim.gitignore | 2 -- 1 file changed, 2 deletions(-) (limited to 'Global') diff --git a/Global/Vim.gitignore b/Global/Vim.gitignore index 325bd576..1099aaab 100644 --- a/Global/Vim.gitignore +++ b/Global/Vim.gitignore @@ -1,8 +1,6 @@ # swap [._]*.s[a-w][a-z] [._]s[a-w][a-z] -# persistent undo -*.un~ # session Session.vim # temporary -- cgit v1.2.3 From cd222dfc626e1ba97a00f1c9a83a9e8e29fd66ba Mon Sep 17 00:00:00 2001 From: Roberto Novelo Date: Wed, 10 Feb 2016 12:45:16 -0600 Subject: Added Library Mappings and VCS Root These files differ on Windows and OS X. --- Global/JetBrains.gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Global') diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index e845b237..b9ed92cb 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -5,6 +5,8 @@ .idea/workspace.xml .idea/tasks.xml .idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml # Sensitive or high-churn files: .idea/dataSources.ids -- cgit v1.2.3