diff options
| -rw-r--r-- | Android.gitignore | 3 | ||||
| -rw-r--r-- | ArchLinuxPackages.gitignore | 7 | ||||
| -rw-r--r-- | CMake.gitignore | 1 | ||||
| -rw-r--r-- | Dart.gitignore | 1 | ||||
| -rw-r--r-- | Global/JetBrains.gitignore | 2 | ||||
| -rw-r--r-- | Global/Xcode.gitignore | 3 | ||||
| -rw-r--r-- | Haskell.gitignore | 1 | ||||
| -rw-r--r-- | KiCAD.gitignore | 2 | ||||
| -rw-r--r-- | Maven.gitignore | 1 | ||||
| -rw-r--r-- | Meteor.gitignore | 2 | ||||
| -rw-r--r-- | Node.gitignore | 1 | ||||
| -rw-r--r-- | Objective-C.gitignore | 3 | ||||
| -rw-r--r-- | R.gitignore | 3 | ||||
| -rw-r--r-- | Ruby.gitignore | 1 | ||||
| -rw-r--r-- | Sass.gitignore | 2 | ||||
| -rw-r--r-- | Swift.gitignore | 3 | ||||
| -rw-r--r-- | TeX.gitignore | 9 | ||||
| -rw-r--r-- | Typo3.gitignore | 16 | ||||
| -rw-r--r-- | VisualStudio.gitignore | 11 |
19 files changed, 53 insertions, 19 deletions
diff --git a/Android.gitignore b/Android.gitignore index 9068cd01..94eb0fb1 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -24,3 +24,6 @@ proguard/ # Log Files *.log + +# Android Studio Navigation editor temp files +.navigation/ diff --git a/ArchLinuxPackages.gitignore b/ArchLinuxPackages.gitignore index dcf73900..b7390552 100644 --- a/ArchLinuxPackages.gitignore +++ b/ArchLinuxPackages.gitignore @@ -1,14 +1,13 @@ *.tar *.tar.* +*.jar +*.exe +*.msi *.zip *.tgz *.log *.log.* *.sig -# AUR metadata -.AURINFO -.SRCINFO - pkg/ src/ diff --git a/CMake.gitignore b/CMake.gitignore index 52540e70..b558e9af 100644 --- a/CMake.gitignore +++ b/CMake.gitignore @@ -1,5 +1,6 @@ CMakeCache.txt CMakeFiles +CMakeScripts Makefile cmake_install.cmake install_manifest.txt diff --git a/Dart.gitignore b/Dart.gitignore index 51834591..38548b37 100644 --- a/Dart.gitignore +++ b/Dart.gitignore @@ -3,6 +3,7 @@ .pub/ build/ packages +.packages # Or the files created by dart2js. *.dart.js diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 5f1d7b68..573bcf45 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,4 +1,4 @@ -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio *.iml diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index c08bace2..37de8bb4 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -18,5 +18,6 @@ DerivedData/ xcuserdata/ ## Other -*.xccheckout *.moved-aside +*.xccheckout +*.xcscmblueprint diff --git a/Haskell.gitignore b/Haskell.gitignore index 48fe6f3e..cdc3c4dc 100644 --- a/Haskell.gitignore +++ b/Haskell.gitignore @@ -13,3 +13,4 @@ cabal.sandbox.config *.prof *.aux *.hp +.stack-work/ diff --git a/KiCAD.gitignore b/KiCAD.gitignore index 3dd696ea..a9e50ba4 100644 --- a/KiCAD.gitignore +++ b/KiCAD.gitignore @@ -3,6 +3,8 @@ # Temporary files *.000 *.bak +*.bck +*.kicad_pcb-bak # Netlist files (exported from Eeschema) *.net diff --git a/Maven.gitignore b/Maven.gitignore index 44c0caae..1cdc9f7f 100644 --- a/Maven.gitignore +++ b/Maven.gitignore @@ -1,5 +1,4 @@ target/ -**/target/ pom.xml.tag pom.xml.releaseBackup pom.xml.versionsBackup diff --git a/Meteor.gitignore b/Meteor.gitignore deleted file mode 100644 index 0167b87c..00000000 --- a/Meteor.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.meteor/local -.meteor/meteorite diff --git a/Node.gitignore b/Node.gitignore index f7f6a08c..b38069de 100644 --- a/Node.gitignore +++ b/Node.gitignore @@ -1,6 +1,7 @@ # Logs logs *.log +npm-debug.log* # Runtime data pids diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 59f6862a..2f65d4cd 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -18,8 +18,9 @@ DerivedData/ xcuserdata/ ## Other -*.xccheckout *.moved-aside +*.xccheckout +*.xcscmblueprint ## Obj-C/Swift specific *.hmap diff --git a/R.gitignore b/R.gitignore index b9003860..49037a0b 100644 --- a/R.gitignore +++ b/R.gitignore @@ -11,3 +11,6 @@ # produced vignettes vignettes/*.html vignettes/*.pdf + +# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3 +.httr-oauth diff --git a/Ruby.gitignore b/Ruby.gitignore index 28f48498..1ba91c05 100644 --- a/Ruby.gitignore +++ b/Ruby.gitignore @@ -5,6 +5,7 @@ /InstalledFiles /pkg/ /spec/reports/ +/spec/examples.txt /test/tmp/ /test/version_tmp/ /tmp/ diff --git a/Sass.gitignore b/Sass.gitignore index 0f1905d3..486b32ce 100644 --- a/Sass.gitignore +++ b/Sass.gitignore @@ -1,2 +1,2 @@ -.sass-cache +.sass-cache/ *.css.map diff --git a/Swift.gitignore b/Swift.gitignore index e278bf19..64daed58 100644 --- a/Swift.gitignore +++ b/Swift.gitignore @@ -18,8 +18,9 @@ DerivedData/ xcuserdata/ ## Other -*.xccheckout *.moved-aside +*.xccheckout +*.xcscmblueprint ## Obj-C/Swift specific *.hmap diff --git a/TeX.gitignore b/TeX.gitignore index 2998177b..a7a84bc9 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -33,6 +33,7 @@ ## Auxiliary and intermediate files from other packages: + # algorithms *.alg *.loa @@ -103,6 +104,9 @@ _minted* # morewrites *.mw +# mylatexformat +*.fmt + # nomencl *.nlo @@ -116,6 +120,11 @@ _minted* *.sympy sympy-plots-for-*.tex/ +# TikZ & PGF +*.dpth +*.md5 +*.auxlock + # todonotes *.tdo diff --git a/Typo3.gitignore b/Typo3.gitignore index d1593b16..5781fcc3 100644 --- a/Typo3.gitignore +++ b/Typo3.gitignore @@ -1,18 +1,20 @@ -## TYPO3 v4 +## TYPO3 v6.2 # Ignore serveral upload and file directories. /fileadmin/user_upload/ /fileadmin/_temp_/ +/fileadmin/_processed_/ /uploads/ # Ignore cache /typo3conf/temp_CACHED* /typo3conf/temp_fieldInfo.php -# Ignore local config which overrides typo3 config. -# You should include your local stuff with `@include('localconf_local.php');` at the end of localconf.php. -# See http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git for details. -/typo3conf/localconf_local.php +/typo3conf/deprecation_*.log +/typo3conf/AdditionalConfiguration.php # Ignore system folders, you should have them symlinked. -# If not comment out the following two entries. +# If not comment out the following entries. /typo3 -/t3lib +/typo3_src +/typo3_src-* +/.htaccess +/index.php # Ignore temp directory. /typo3temp/ diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 385a36e0..7c4ca8bb 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -24,6 +24,8 @@ bld/ # Visual Studio 2015 cache/options directory .vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ # MSTest test Results [Tt]est[Rr]esult*/ @@ -106,6 +108,7 @@ _TeamCity* # NCrunch _NCrunch_* .*crunch*.local.xml +nCrunchTemp_* # MightyMoose *.mm.* @@ -203,3 +206,11 @@ FakesAssemblies/ # Visual Studio 6 workspace options file *.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions |