diff options
author | Florian Fida <f+git@fida.biz> | 2015-06-17 21:46:54 +0200 |
---|---|---|
committer | Florian Fida <f+git@fida.biz> | 2015-06-17 21:46:54 +0200 |
commit | 7112380d9718c10b2bd9b108785d745fda0d2431 (patch) | |
tree | 4ddd11883ef9c08718228c545efd92cde4df9c88 /Typo3.gitignore | |
parent | b304edf487ce607174e188712225b5269d43f279 (diff) | |
download | gitignore-7112380d9718c10b2bd9b108785d745fda0d2431.tar.gz gitignore-7112380d9718c10b2bd9b108785d745fda0d2431.zip |
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.
Diffstat (limited to 'Typo3.gitignore')
-rw-r--r-- | Typo3.gitignore | 16 |
1 files changed, 9 insertions, 7 deletions
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/ |