diff options
| -rw-r--r-- | CMake.gitignore | 1 | ||||
| -rw-r--r-- | Maven.gitignore | 1 | ||||
| -rw-r--r-- | R.gitignore | 3 | ||||
| -rw-r--r-- | Ruby.gitignore | 1 | ||||
| -rw-r--r-- | Sass.gitignore | 2 | ||||
| -rw-r--r-- | Typo3.gitignore | 16 | ||||
| -rw-r--r-- | VisualStudio.gitignore | 11 |
7 files changed, 26 insertions, 9 deletions
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/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/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/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 |