diff options
Diffstat (limited to 'Global')
-rw-r--r-- | Global/Ansible.gitignore | 1 | ||||
-rw-r--r-- | Global/Bazaar.gitignore | 2 | ||||
-rw-r--r-- | Global/Emacs.gitignore | 5 | ||||
-rw-r--r-- | Global/IPythonNotebook.gitignore | 2 | ||||
-rw-r--r-- | Global/JetBrains.gitignore | 26 | ||||
-rw-r--r-- | Global/Linux.gitignore | 3 | ||||
-rw-r--r-- | Global/Matlab.gitignore | 3 | ||||
-rw-r--r-- | Global/NetBeans.gitignore | 1 | ||||
-rw-r--r-- | Global/Stata.gitignore | 24 | ||||
-rw-r--r-- | Global/SublimeText.gitignore | 3 | ||||
-rw-r--r-- | Global/Tags.gitignore | 1 | ||||
-rw-r--r-- | Global/Vim.gitignore | 6 | ||||
-rw-r--r-- | Global/VisualStudioCode.gitignore | 7 | ||||
-rw-r--r-- | Global/Windows.gitignore | 3 | ||||
-rw-r--r-- | Global/macOS.gitignore (renamed from Global/OSX.gitignore) | 51 |
15 files changed, 90 insertions, 48 deletions
diff --git a/Global/Ansible.gitignore b/Global/Ansible.gitignore new file mode 100644 index 00000000..a8b42eb6 --- /dev/null +++ b/Global/Ansible.gitignore @@ -0,0 +1 @@ +*.retry diff --git a/Global/Bazaar.gitignore b/Global/Bazaar.gitignore new file mode 100644 index 00000000..3cbbcbd1 --- /dev/null +++ b/Global/Bazaar.gitignore @@ -0,0 +1,2 @@ +.bzr/ +.bzrignore diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore index 0c96c9ad..3ac7904d 100644 --- a/Global/Emacs.gitignore +++ b/Global/Emacs.gitignore @@ -39,4 +39,7 @@ flycheck_*.el /server/ # projectiles files -.projectile
\ No newline at end of file +.projectile + +# directory configuration +.dir-locals.el diff --git a/Global/IPythonNotebook.gitignore b/Global/IPythonNotebook.gitignore deleted file mode 100644 index 27c13510..00000000 --- a/Global/IPythonNotebook.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Temporary data -.ipynb_checkpoints/ diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index ea83a5eb..401fee15 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -2,26 +2,24 @@ # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml -.idea/dictionaries -.idea/vcs.xml -.idea/jsLibraryMappings.xml +.idea/**/workspace.xml +.idea/**/tasks.xml # Sensitive or high-churn files: -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.xml +.idea/**/dataSources.local.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: *.iws diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore index cc958689..b56bf65d 100644 --- a/Global/Linux.gitignore +++ b/Global/Linux.gitignore @@ -8,3 +8,6 @@ # Linux trash folder which might appear on any partition or disk .Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore index 32a5ad4c..09dfde64 100644 --- a/Global/Matlab.gitignore +++ b/Global/Matlab.gitignore @@ -17,3 +17,6 @@ slprj/ # Session info octave-workspace + +# Simulink autosave extension +.autosave diff --git a/Global/NetBeans.gitignore b/Global/NetBeans.gitignore index 520d91ff..254108cd 100644 --- a/Global/NetBeans.gitignore +++ b/Global/NetBeans.gitignore @@ -3,5 +3,4 @@ build/ nbbuild/ dist/ nbdist/ -nbactions.xml .nb-gradle/ diff --git a/Global/Stata.gitignore b/Global/Stata.gitignore new file mode 100644 index 00000000..07997bb1 --- /dev/null +++ b/Global/Stata.gitignore @@ -0,0 +1,24 @@ +# .gitignore file for git projects containing Stata files +# Commercial statistical software: http://www.stata.com + +# Stata dataset and output files +*.dta +*.gph +*.log +*.smcl +*.stpr +*.stsem + +# Graphic export files from Stata +# Stata command graph export: http://www.stata.com/manuals14/g-2graphexport.pdf +# +# You may add graphic export files to your .gitignore. However you should be +# aware that this will exclude all image files from this main directory +# and subdirectories. +# *.ps +# *.eps +# *.wmf +# *.emf +# *.pdf +# *.png +# *.tif diff --git a/Global/SublimeText.gitignore b/Global/SublimeText.gitignore index 69c8c2b2..95ff2244 100644 --- a/Global/SublimeText.gitignore +++ b/Global/SublimeText.gitignore @@ -20,6 +20,9 @@ Package Control.ca-bundle Package Control.system-ca-bundle Package Control.cache/ Package Control.ca-certs/ +Package Control.merged-ca-bundle +Package Control.user-ca-bundle +oscrypto-ca-bundle.crt bh_unicode_properties.cache # Sublime-github package stores a github token in this file diff --git a/Global/Tags.gitignore b/Global/Tags.gitignore index c0318165..91927af4 100644 --- a/Global/Tags.gitignore +++ b/Global/Tags.gitignore @@ -9,6 +9,7 @@ gtags.files GTAGS GRTAGS GPATH +GSYMS cscope.files cscope.out cscope.in.out diff --git a/Global/Vim.gitignore b/Global/Vim.gitignore index bdc04a0b..42e7afc1 100644 --- a/Global/Vim.gitignore +++ b/Global/Vim.gitignore @@ -1,6 +1,8 @@ # swap -[._]*.s[a-w][a-z] -[._]s[a-w][a-z] +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] # session Session.vim # temporary diff --git a/Global/VisualStudioCode.gitignore b/Global/VisualStudioCode.gitignore index faa18382..0511e2b5 100644 --- a/Global/VisualStudioCode.gitignore +++ b/Global/VisualStudioCode.gitignore @@ -1,2 +1,5 @@ -.vscode - +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore index a0d31452..ba26afd9 100644 --- a/Global/Windows.gitignore +++ b/Global/Windows.gitignore @@ -1,6 +1,7 @@ -# Windows image file caches +# Windows thumbnail cache files Thumbs.db ehthumbs.db +ehthumbs_vista.db # Folder config file Desktop.ini diff --git a/Global/OSX.gitignore b/Global/macOS.gitignore index 5972fe50..f0f3fbc0 100644 --- a/Global/OSX.gitignore +++ b/Global/macOS.gitignore @@ -1,25 +1,26 @@ -*.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon
- -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk +*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
|