From 19c86335a51cc2b25976b80d91bd22df8ae9c7e8 Mon Sep 17 00:00:00 2001
From: Oliver Klee <typo3-coding@oliverklee.de>
Date: Fri, 1 Nov 2013 19:51:34 +0100
Subject: [PATCH] [CLEANUP] Update .gitignore.

---
 .gitignore | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0ee23cb..fc0b7c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,22 @@
-## Typo3
-# Ignore serveral upload and file directories.
-/fileadmin/user_upload/
-/fileadmin/_temp_/
-/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
-# Ignore system folders, you should have them symlinked.
-# If not comment out the following two entries.
-/typo3/
-/t3lib/
-# Ignore temp directory.
-/typo3temp/
+#########################
+# global ignore file
+########################
+# ignoring temporary files (left by e.g. vim)
+# ignoring by common IDE's used directories/files
+# dont ignore .rej and .orig as we want to see/clean files after conflict resolution
+#
+# for local exclude patterns please edit .git/info/exclude
+#
+*~
+*.bak
+*.idea
+*.project
+*.swp
+.buildpath
+.cache
+.project
+.session
+.settings
+.TemporaryItems
+.webprj
+nbproject