From: Florian Fida <f+git@fida.biz>
Date: Wed, 17 Jun 2015 19:46:54 +0000 (+0200)
Subject: Update Typo3.gitignore for CMS v6.2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7112380d9718c10b2bd9b108785d745fda0d2431;p=gitignore.git

Update Typo3.gitignore for CMS v6.2

Typo3 now has an official way of overriding Configuration (AdditionalConfiguration.php).
/t3lib has moved into the /typo3 Directory.
Removed v4 specific ignores because it is deprecated and should no longer be used.
There were ignores missing for the symlinked setup.
---

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/